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/ApsPartPlan.java | 21 +++++----------------
1 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java
index 6ebb573..c12bbd2 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java
@@ -125,11 +125,9 @@
private String nextProcessDeparment;
/** 鏄惁鎸傝捣 */
-// @Excel(name = "鏄惁鎸傝捣")
- private Integer isSuspended;
- /** 鏄惁鎸傝捣 */
@Excel(name = "鏄惁鎸傝捣")
- private String isSuspendedTxt;
+ private String isSuspended;
+
/** 澶栧崗鏍囪瘑 */
@Excel(name = "澶栧崗鏍囪瘑")
private String isOutsourcing;
@@ -168,7 +166,7 @@
private Integer hasRisk;
/** 宸ュ巶 */
- @Excel(name = "宸ュ巶")
+// @Excel(name = "宸ュ巶")
private String plant;
public void setId(String id)
@@ -421,12 +419,12 @@
return nextProcessDeparment;
}
- public void setIsSuspended(Integer isSuspended)
+ public void setIsSuspended(String isSuspended)
{
this.isSuspended = isSuspended;
}
- public Integer getIsSuspended()
+ public String getIsSuspended()
{
return isSuspended;
}
@@ -562,15 +560,6 @@
.append("plant", getPlant())
.toString();
}
-
- public String getIsSuspendedTxt() {
- return isSuspendedTxt;
- }
-
- public void setIsSuspendedTxt(String isSuspendedTxt) {
- this.isSuspendedTxt = isSuspendedTxt;
- }
-
public String getPlant() {
return plant;
}
--
Gitblit v1.9.3