From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java |   58 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java
index c4886ea..148ec52 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java
@@ -29,26 +29,26 @@
      */
     @Excel(name = "澶囦欢id", width = 15)
     @ApiModelProperty(value = "澶囦欢id")
-    private String sparePartId;
+    private java.lang.String sparePartId;
     /**
      * 鎵规鍙�
      */
     @Excel(name = "鎵规鍙�", width = 15)
     @ApiModelProperty(value = "鎵规鍙�")
-    private String batchNum;
+    private java.lang.String batchNum;
     /**
      * 澶辨晥棰勬姤璀�
      */
     @Excel(name = "澶辨晥棰勬姤璀�", width = 15)
     @ApiModelProperty(value = "澶辨晥棰勬姤璀�")
-    private String validityForecast;
+    private java.lang.String validityForecast;
 
     /**
      * 搴撳瓨棰勬姤璀�
      */
     @Excel(name = "搴撳瓨棰勬姤璀�", width = 15)
     @ApiModelProperty(value = "搴撳瓨棰勬姤璀�")
-    private String inventoryForecast;
+    private java.lang.String inventoryForecast;
 
 
     /**
@@ -57,54 +57,53 @@
     @Excel(name = "鍒堕�犲晢", width = 15)
     @ApiModelProperty(value = "鍒堕�犲晢")
     @Dict(dictTable = "mom_base_constructor", dicCode = "id", dicText = "name")
-    private String constructorId;
+    private java.lang.String constructorId;
     /**
      * 涓诲崟浣峣d
      */
-    @Excel(name = "涓诲崟浣峣d", width = 15)
+    @Excel(name = "鍗曚綅", width = 15)
     @ApiModelProperty(value = "涓诲崟浣峣d")
     @Dict(dictTable = "mom_base_unit", dicCode = "id", dicText = "name")
-    private String mainUnitId;
+    private java.lang.String mainUnitId;
     /**
      * 杈呭崟浣峣d
      */
     @Excel(name = "杈呭崟浣峣d", width = 15)
     @ApiModelProperty(value = "杈呭崟浣峣d")
     @Dict(dictTable = "mom_base_unit", dicCode = "id", dicText = "name")
-    private String auxiliaryUnitId;
+    private java.lang.String auxiliaryUnitId;
 
-    @Excel(name = "浠撳簱id", width = 15)
+    @Excel(name = "浠撳簱", width = 15)
     @ApiModelProperty(value = "浠撳簱id")
-    @Dict(dictTable = "mom_base_warehouse", dicCode = "id", dicText = "name")
-    private String warehouseId;
+    private java.lang.String warehouseId;
 
-    @Excel(name = "搴撳尯id", width = 15)
+    @Excel(name = "搴撳尯", width = 15)
     @ApiModelProperty(value = "搴撳尯id")
     @Dict(dictTable = "mom_base_warehouse_area", dicCode = "id", dicText = "name")
-    private String warehouseAreaId;
+    private java.lang.String warehouseAreaId;
 
-    @Excel(name = "搴撲綅id", width = 15)
+    @Excel(name = "搴撲綅", width = 15)
     @ApiModelProperty(value = "搴撲綅id")
     @Dict(dictTable = "mom_base_warehouse_location", dicCode = "id", dicText = "name")
-    private String warehouseLocationId;
+    private java.lang.String warehouseLocationId;
     /**
      * 涓绘暟閲�
      */
-    @Excel(name = "涓绘暟閲�", width = 15)
+    @Excel(name = "鏁伴噺", width = 15)
     @ApiModelProperty(value = "涓绘暟閲�")
-    private Double mainQuantity;
+    private java.lang.Double mainQuantity;
     /**
      * 杈呮暟閲�
      */
     @Excel(name = "杈呮暟閲�", width = 15)
     @ApiModelProperty(value = "杈呮暟閲�")
-    private Double auxiliaryQuantity;
+    private java.lang.Double auxiliaryQuantity;
 
 
     /**
      * 鍑哄巶鏃ユ湡
-     */
-    @Excel(name = "鍑哄巶鏃ユ湡", width = 15)
+    **/
+    @Excel(name = "鍑哄巶鏃ユ湡", width = 15,format = "yyyy-MM-dd")
     @ApiModelProperty(value = "鍑哄巶鏃ユ湡")
     private java.util.Date manufactureDate;
 
@@ -112,8 +111,9 @@
     /**
      * 渚涘簲鍟唅d
      */
-    @Excel(name = "渚涘簲鍟唅d", width = 15)
+    @Excel(name = "渚涘簲鍟�", width = 15)
     @ApiModelProperty(value = "渚涘簲鍟唅d")
+    @Dict(dictTable = "mom_base_supplier", dicCode = "id", dicText = "name")
     private String supplierId;
 
 
@@ -122,14 +122,14 @@
      */
     @Excel(name = "鏈夋晥鏈�", width = 15)
     @ApiModelProperty(value = "鏈夋晥鏈�")
-    private Integer validityPeriod;
+    private java.lang.Integer validityPeriod;
 
     /**
      * 绉熸埛id
      */
     @Excel(name = "绉熸埛id", width = 15)
     @ApiModelProperty(value = "绉熸埛id")
-    private String tenantId;
+    private java.lang.String tenantId;
 
 
     /**
@@ -150,37 +150,37 @@
      */
     @Excel(name = "澶囨敞", width = 15)
     @ApiModelProperty(value = "澶囨敞")
-    private String remark;
+    private java.lang.String remark;
     /**
      * 澶囩敤瀛楁1
      */
     @Excel(name = "澶囩敤瀛楁1", width = 15)
     @ApiModelProperty(value = "澶囩敤瀛楁1")
-    private String sparesUda1;
+    private java.lang.String sparesUda1;
     /**
      * 澶囩敤瀛楁2
      */
     @Excel(name = "澶囩敤瀛楁2", width = 15)
     @ApiModelProperty(value = "澶囩敤瀛楁2")
-    private String sparesUda2;
+    private java.lang.String sparesUda2;
     /**
      * 澶囩敤瀛楁3
      */
     @Excel(name = "澶囩敤瀛楁3", width = 15)
     @ApiModelProperty(value = "澶囩敤瀛楁3")
-    private String sparesUda3;
+    private java.lang.String sparesUda3;
     /**
      * 澶囩敤瀛楁4
      */
     @Excel(name = "澶囩敤瀛楁4", width = 15)
     @ApiModelProperty(value = "澶囩敤瀛楁4")
-    private String sparesUda4;
+    private java.lang.String sparesUda4;
     /**
      * 澶囩敤瀛楁5
      */
     @Excel(name = "澶囩敤瀛楁5", width = 15)
     @ApiModelProperty(value = "澶囩敤瀛楁5")
-    private String sparesUda5;
+    private java.lang.String sparesUda5;
 
     /**
      * 澶囦欢鍚嶇О

--
Gitblit v1.9.3