From 80e8110e4f3a132ee2819f2560a661c6f6693fcf Mon Sep 17 00:00:00 2001
From: houjie <714924425@qq.com>
Date: 星期三, 30 八月 2023 18:51:59 +0800
Subject: [PATCH] 备件调整  导入导出

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePart.java |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePart.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePart.java
index 16bf5f5..0986f12 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePart.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePart.java
@@ -35,7 +35,6 @@
     private static final long serialVersionUID = 1L;
 
 	/**澶囦欢鍒嗙被id*/
-	@Excel(name = "澶囦欢鍒嗙被id", width = 15)
     @ApiModelProperty(value = "澶囦欢鍒嗙被id")
     private java.lang.String sparePartCategoryId;
 	/**澶囦欢缂栫爜*/
@@ -59,23 +58,22 @@
     @ApiModelProperty(value = "瑙勫垯")
     private java.lang.String specification;
 	/**鍒堕�犲晢*/
-	@Excel(name = "鍒堕�犲晢", width = 15)
+	@Excel(name = "鍒堕�犲晢", width = 15,dictTable="mom_base_constructor",dicText="name")
     @ApiModelProperty(value = "鍒堕�犲晢")
     @Dict(dicCode = "id",dictTable="mom_base_constructor",dicText="name")
     private java.lang.String constructorId;
 	/**涓诲崟浣峣d*/
-	@Excel(name = "涓诲崟浣峣d", width = 15)
+	@Excel(name = "涓诲崟浣�", width = 15,dicCode = "id",dictTable="mom_base_unit",dicText="name")
     @ApiModelProperty(value = "涓诲崟浣峣d")
     @Dict(dicCode = "id",dictTable="mom_base_unit",dicText="name")
     private java.lang.String mainUnitId;
 	/**杈呭崟浣峣d*/
-	@Excel(name = "杈呭崟浣峣d", width = 15)
+
     @ApiModelProperty(value = "杈呭崟浣峣d")
     @Dict(dicCode = "id",dictTable="mom_base_unit",dicText="name")
     private java.lang.String auxiliaryUnitId;
 
     /**鎹㈢畻姣斾緥*/
-    @Excel(name = "鎹㈢畻姣斾緥", width = 15)
     @ApiModelProperty(value = "鎹㈢畻姣斾緥")
     private java.lang.String conversionRatio;
 
@@ -92,7 +90,7 @@
     @ApiModelProperty(value = "鏈夋晥鏈�")
     private java.lang.Integer validityPeriod;
 	/**鏈夋晥鏈熷崟浣�*/
-	@Excel(name = "鏈夋晥鏈熷崟浣�", width = 15)
+	@Excel(name = "鏈夋晥鏈熷崟浣�", width = 15,dictTable="mom_base_unit",dicText="name")
     @ApiModelProperty(value = "鏈夋晥鏈熷崟浣�")
     @Dict(dicCode = "id",dictTable="mom_base_unit",dicText="name")
     private java.lang.String validityPeriodUnitId;
@@ -122,32 +120,33 @@
     @ApiModelProperty(value = "绉熸埛id")
     private java.lang.String tenantId;
 	/**鍒犻櫎鐘舵��(0-姝e父,1-宸插垹闄�)*/
-	@Excel(name = "鍒犻櫎鐘舵��(0-姝e父,1-宸插垹闄�)", width = 15)
+
+
     @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝e父,1-宸插垹闄�)")
     @TableLogic
     private Integer delFlag = CommonConstant.DEL_FLAG_0;
 	/**澶囨敞*/
-	@Excel(name = "澶囨敞", width = 15)
+
     @ApiModelProperty(value = "澶囨敞")
     private java.lang.String remark;
 	/**澶囩敤瀛楁1*/
-	@Excel(name = "澶囩敤瀛楁1", width = 15)
+
     @ApiModelProperty(value = "澶囩敤瀛楁1")
     private java.lang.String uda1;
 	/**澶囩敤瀛楁2*/
-	@Excel(name = "澶囩敤瀛楁2", width = 15)
+
     @ApiModelProperty(value = "澶囩敤瀛楁2")
     private java.lang.String uda2;
 	/**澶囩敤瀛楁3*/
-	@Excel(name = "澶囩敤瀛楁3", width = 15)
+
     @ApiModelProperty(value = "澶囩敤瀛楁3")
     private java.lang.String uda3;
 	/**澶囩敤瀛楁4*/
-	@Excel(name = "澶囩敤瀛楁4", width = 15)
+
     @ApiModelProperty(value = "澶囩敤瀛楁4")
     private java.lang.String uda4;
 	/**澶囩敤瀛楁5*/
-	@Excel(name = "澶囩敤瀛楁5", width = 15)
+
     @ApiModelProperty(value = "澶囩敤瀛楁5")
     private java.lang.String uda5;
 

--
Gitblit v1.9.3