From 290a01c4a1eb457e858ca52d7b1c03a6f23e4488 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 28 十一月 2022 16:20:00 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/entity/equipment/EquipmentBayonet.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/entity/equipment/EquipmentBayonet.java b/ycl-platform/src/main/java/com/ycl/entity/equipment/EquipmentBayonet.java
index 4cf2da5..bea07f8 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/equipment/EquipmentBayonet.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/equipment/EquipmentBayonet.java
@@ -35,9 +35,9 @@
/**
* 鍗″彛鍚嶇О
*/
- @TableField("bayonet_name")
+ @TableField("name")
@ExcelProperty(index = 1, value = "鍗″彛鍚嶇О")
- private String bayonetName;
+ private String name;
/**
* 鍗″彛缁忓害
@@ -82,4 +82,10 @@
*/
@TableField("in_out_city_type")
private Integer inOutCityType;
+
+ /**
+ * 鎵�灞炲尯鍩�
+ */
+ @TableField("belong_area")
+ private Integer belongArea;
}
\ No newline at end of file
--
Gitblit v1.8.0