From 7be8ccdf0f6f2b4790a2b639694b225c2765a38c Mon Sep 17 00:00:00 2001
From: fangyuan <527392886@qq.com>
Date: 星期一, 28 十一月 2022 17:04:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/vo/equipment/EquipmentBayonetVO.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 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 7e9ed3e..da9ae92 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
@@ -31,7 +31,7 @@
*/
@ApiModelProperty(value = "鍗″彛鍚嶇О")
@ExcelProperty(index = 0, value = "鍗″彛鍚嶇О")
- private String bayonetName;
+ private String name;
/**
* 鍗″彛缁忓害
@@ -72,13 +72,29 @@
* 鍓嶇绫诲瀷
*/
@ApiModelProperty(value = "鍓嶇绫诲瀷")
+ @ExcelIgnore
+ private Integer frontEndType;
+
+ /**
+ * 鍑哄叆鍩庣被鍨�
+ */
+ @ApiModelProperty(value = "鍑哄叆鍩庣被鍨�")
+ @ExcelIgnore
+ private Integer inOutCityType;
+ /**
+ * 鍓嶇绫诲瀷
+ */
+ @ApiModelProperty(value = "鍓嶇绫诲瀷")
@ExcelProperty(index = 5, value = "鍓嶇绫诲瀷")
- private String frontEndType;
+ private String frontEndTypeName;
/**
* 鍑哄叆鍩庣被鍨�
*/
@ApiModelProperty(value = "鍑哄叆鍩庣被鍨�")
@ExcelProperty(index = 6, value = "鍑哄叆鍩庣被鍨�")
- private String inOutCityType;
+ private String inOutCityTypeName;
+
+ @ExcelIgnore
+ private String belongArea;
}
\ No newline at end of file
--
Gitblit v1.8.0