From bb3a0be871454582ac64e4fd2a1d7f06d7ec7d12 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 21 五月 2025 10:10:43 +0800
Subject: [PATCH] 标准工序:Excel注解调整

---
 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java |   32 +++++++++++++++++---------------
 1 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java
index 6986fd7..e7d134b 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java
@@ -38,6 +38,10 @@
     @Schema(description = "璧勬簮缁�", type = "String")
     @Excel(name = "璧勬簮缁�")
     private String resourceGroupName;
+    /** 涓撲笟 */
+    @Schema(description = "涓撲笟", type = "String")
+    @Excel(name = "涓撲笟")
+    private String major;
 
     /** 浜ц兘妯″瀷: 鐙崰/鍚堟壒 */
     @Schema(description = "浜ц兘妯″瀷", type = "String")
@@ -55,8 +59,8 @@
     private String plantId;
 
     /** 宸ュ巶 */
-    @Schema(description = "宸ュ巶", type = "String")
-    @Excel(name = "宸ュ巶")
+    @Schema(description = "閫傜敤宸ュ巶", type = "String")
+    @Excel(name = "閫傜敤宸ュ巶")
     private String plant;
 
     /** 杞﹂棿Id */
@@ -65,8 +69,8 @@
     private String workShopId;
 
     /** 杞﹂棿 */
-    @Schema(description = "杞﹂棿", type = "String")
-    @Excel(name = "杞﹂棿")
+    @Schema(description = "閫傜敤杞﹂棿", type = "String")
+    @Excel(name = "閫傜敤杞﹂棿")
     private String workShop;
 
     /** 鏃ュ巻Id */
@@ -74,24 +78,22 @@
 //    @Excel(name = "鏃ュ巻Id")
     private Long workCalenderId;
 
-    /** 鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛� */
-    @Schema(description = "鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛�", type = "String")
-    private String delFlag;
+    /** 鏃ュ巻鎻忚堪 */
+    @Schema(description = "鏃ュ巻鎻忚堪", type = "String")
+    @Excel(name = "鏃ュ巻鎻忚堪")
+    private String workCalender;
 
     /** 浜ц兘妯″瀷Id */
     @Schema(description = "浜ц兘妯″瀷Id", type = "Long")
 //    @Excel(name = "浜ц兘妯″瀷Id")
     private Long modelId;
 
-    /** 鏃ュ巻鎻忚堪 */
-    @Schema(description = "鏃ュ巻鎻忚堪", type = "String")
-    @Excel(name = "鏃ュ巻鎻忚堪")
-    private String workCalender;
 
-    /** 涓撲笟 */
-    @Schema(description = "涓撲笟", type = "String")
-    @Excel(name = "涓撲笟")
-    private String major;
+    /** 鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛� */
+    @Schema(description = "鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛�", type = "String")
+    private String delFlag;
+
+
 
     public String getMajor() {
         return major;

--
Gitblit v1.9.3