From 14b1e801322db00b6b0d8dd059b9720adeb21bd8 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期二, 29 八月 2023 11:58:44 +0800
Subject: [PATCH] 设备分类

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentCategory.java |   17 ++++++-----------
 1 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentCategory.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentCategory.java
index 96a8a6f..7419468 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentCategory.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentCategory.java
@@ -38,7 +38,6 @@
     private static final long serialVersionUID = 1L;
 
 	/**鐖秈d*/
-	@Excel(name = "鐖秈d", width = 15)
     @ApiModelProperty(value = "鐖秈d")
     private String parentId;
 	/**璁惧鍒嗙被缂栫爜*/
@@ -51,31 +50,28 @@
     private String name;
 
 	/**绉熸埛id*/
-	@Excel(name = "绉熸埛id", width = 15)
     @ApiModelProperty(value = "绉熸埛id")
     private String tenantId;
 	/**鍒犻櫎鐘舵��(0-姝e父,1-宸插垹闄�)*/
-	@Excel(name = "鍒犻櫎鐘舵��(0-姝e父,1-宸插垹闄�)", width = 15)
     @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝e父,1-宸插垹闄�)")
     private Integer delFlag = CommonConstant.DEL_FLAG_0;
 	/**澶囩敤瀛楁1*/
-	@Excel(name = "澶囩敤瀛楁1", width = 15)
-    @ApiModelProperty(value = "澶囩敤瀛楁1")
+	@Excel(name = "璁惧鍒嗙被鏍囪瘑", width = 15,dicCode = "equipment_category")
+    @ApiModelProperty(value = "璁惧鍒嗙被鏍囪瘑锛堟暟鎹瓧鍏革細equipment_category锛�")
+    @Dict(dicCode = "equipment_category")
     private String equipmentCategoryUda1;
 	/**澶囩敤瀛楁2*/
-	@Excel(name = "澶囩敤瀛楁2", width = 15)
-    @ApiModelProperty(value = "澶囩敤瀛楁2")
+	@Excel(name = "鎶�鏈姸鎬侀壌瀹氬懆鏈�", width = 15,dicCode = "appraisal_cycle")
+    @ApiModelProperty(value = "鎶�鏈姸鎬侀壌瀹氬懆鏈�")
+    @Dict(dicCode = "appraisal_cycle")
     private String equipmentCategoryUda2;
 	/**澶囩敤瀛楁3*/
-	@Excel(name = "澶囩敤瀛楁3", width = 15)
     @ApiModelProperty(value = "澶囩敤瀛楁3")
     private String equipmentCategoryUda3;
 	/**澶囩敤瀛楁4*/
-	@Excel(name = "澶囩敤瀛楁4", width = 15)
     @ApiModelProperty(value = "澶囩敤瀛楁4")
     private String equipmentCategoryUda4;
 	/**澶囩敤瀛楁5*/
-	@Excel(name = "澶囩敤瀛楁5", width = 15)
     @ApiModelProperty(value = "澶囩敤瀛楁5")
     private String equipmentCategoryUda5;
 	/**澶囨敞*/
@@ -84,7 +80,6 @@
     private String remark;
 
     /**鐘舵�� 0 绂佺敤 1 鍚敤*/
-    @Excel(name = "鐘舵�� 0 绂佺敤 1 鍚敤", width = 15)
     @ApiModelProperty(value = "鐘舵�� 0 绂佺敤 1 鍚敤")
     private String status = CommonConstant.STATUS_1;
 

--
Gitblit v1.9.3