From b8cbacf303a46f1eef0c5969b68025e5babd2f1a Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 9 Dec 2024 18:01:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=99=A8=E5=85=B7=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sgzb/material/domain/ProjUsingRecord.java | 49 ++++++++++---------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjUsingRecord.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjUsingRecord.java
index a572aa99..75b575f9 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjUsingRecord.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjUsingRecord.java
@@ -54,17 +54,6 @@ public class ProjUsingRecord {
     @ApiModelProperty(value = "工程Id")
     private Integer proId;
 
-    /**
-     * 库管员id
-     */
-    @ApiModelProperty(value = "库管员id")
-    private Integer userId;
-    /**
-     * 库管员名字
-     */
-    @ApiModelProperty(value = "库管员名字")
-    private String typeKeepName;
-
     /**
      * 工程名称
      */
@@ -105,6 +94,32 @@ public class ProjUsingRecord {
     @ApiModelProperty(value = "设备编码")
     private String maCode;
 
+    /**
+     * 装备管理方式(0编号 1计数)
+     */
+    @ApiModelProperty(value = "装备管理方式名称")
+    private String manageTypeName;
+
+    /**
+     * 装备管理方式(0编号 1计数)
+     */
+    @Excel(name = "管理模式",readConverterExp = "0=编码,1=数量")
+    @ApiModelProperty(value = "装备管理方式")
+    private int manageType;
+
+    /**
+     * 库管员id
+     */
+    @ApiModelProperty(value = "库管员id")
+    private Integer userId;
+
+    /**
+     * 库管员名字
+     */
+    @Excel(name = "库管员")
+    @ApiModelProperty(value = "库管员名字")
+    private String typeKeepName;
+
     /**
      * 计量单位
      */
@@ -207,18 +222,6 @@ public class ProjUsingRecord {
     @ApiModelProperty(value = "数据所属组织")
     private Integer companyId;
 
-    /**
-     * 装备管理方式(0编号 1计数)
-     */
-    @ApiModelProperty(value = "装备管理方式")
-    private int manageType;
-
-    /**
-     * 装备管理方式(0编号 1计数)
-     */
-    @ApiModelProperty(value = "装备管理方式名称")
-    private String manageTypeName;
-
     /**
      * 实时库存
      */