From db1be72e80a9532ceda5000d79c153eb859caa05 Mon Sep 17 00:00:00 2001
From: bluejay <253316343@qq.com>
Date: 星期一, 14 四月 2025 16:46:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
index 8977676..7d6bb49 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
@@ -21,7 +21,7 @@
private String id;
/** 涓昏鍒掑憳 */
- @Excel(name = "涓昏鍒掑憳")
+ @Excel(name = "涓昏鍒�")
private String masterPlanner;
/** 鍛ㄦ棩 */
@@ -121,7 +121,7 @@
/** 鏄惁鎸傝捣 */
@Excel(name = "鏄惁鎸傝捣")
- private Integer isSuspended;
+ private String isSuspended;
/** 澶栧崗鏍囪瘑 */
@Excel(name = "澶栧崗鏍囪瘑")
@@ -161,7 +161,7 @@
private Integer hasRisk;
/** 宸ュ巶 */
- @Excel(name = "宸ュ巶")
+// @Excel(name = "宸ュ巶")
private String plant;
public void setId(String id)
@@ -414,12 +414,12 @@
return nextProcessDeparment;
}
- public void setIsSuspended(Integer isSuspended)
+ public void setIsSuspended(String isSuspended)
{
this.isSuspended = isSuspended;
}
- public Integer getIsSuspended()
+ public String getIsSuspended()
{
return isSuspended;
}
--
Gitblit v1.9.3