From 97fbba68b72955c3735645c0c4e0320eed6461b3 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 17 十月 2022 18:04:10 +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 |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 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 28ef0fd..4cf2da5 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
@@ -1,5 +1,6 @@
 package com.ycl.entity.equipment;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -35,18 +36,21 @@
      * 鍗″彛鍚嶇О
      */
     @TableField("bayonet_name")
+    @ExcelProperty(index = 1, value = "鍗″彛鍚嶇О")
     private String bayonetName;
 
     /**
      * 鍗″彛缁忓害
      */
     @TableField("longitude")
+    @ExcelProperty(index = 1, value = "鍗″彛鍚嶇О")
     private BigDecimal longitude;
 
     /**
      * 鍗″彛绾害
      */
     @TableField("latitude")
+    @ExcelProperty(index = 1, value = "鍗″彛鍚嶇О")
     private BigDecimal latitude;
 
     /**
@@ -66,4 +70,16 @@
      */
     @TableField("description")
     private String description;
+
+    /**
+     * 鍓嶇绫诲瀷
+     */
+    @TableField("front_end_type")
+    private Integer frontEndType;
+
+    /**
+     * 鍑哄叆鍩庣被鍨�
+     */
+    @TableField("in_out_city_type")
+    private Integer inOutCityType;
 }
\ No newline at end of file

--
Gitblit v1.8.0