From 42cce7d9a859083818a0e10eb3b6c80385042e47 Mon Sep 17 00:00:00 2001 From: baizonghao <1719256278@qq.com> Date: 星期六, 18 三月 2023 18:20:04 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-platform/src/main/java/com/ycl/vo/equipment/EquipmentBayonetVO.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/vo/equipment/EquipmentBayonetVO.java b/ycl-platform/src/main/java/com/ycl/vo/equipment/EquipmentBayonetVO.java index da9ae92..3645a59 100644 --- a/ycl-platform/src/main/java/com/ycl/vo/equipment/EquipmentBayonetVO.java +++ b/ycl-platform/src/main/java/com/ycl/vo/equipment/EquipmentBayonetVO.java @@ -95,6 +95,7 @@ @ExcelProperty(index = 6, value = "鍑哄叆鍩庣被鍨�") private String inOutCityTypeName; - @ExcelIgnore + @ApiModelProperty(value = "鎵�灞炲尯鍩�") + @ExcelProperty(index = 7, value = "鎵�灞炲尯鍩�") private String belongArea; } \ No newline at end of file -- Gitblit v1.8.0