From 38b44e0c9996f06524903417f1d0a3f746b4550b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 04 十二月 2023 17:47:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/entity/equipment/EquipmentBayonet.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 2c16a23..14c3738 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;
/**
* 鍗″彛缁忓害
@@ -87,5 +87,5 @@
* 鎵�灞炲尯鍩�
*/
@TableField("belong_area")
- private Integer belongArea;
+ private String belongArea;
}
\ No newline at end of file
--
Gitblit v1.8.0