From 12ada3a7e6680d5ab92901410e3cedd9b8077e56 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 16 十二月 2023 17:08:46 +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