From b2f49de3957eaa9300a0e8f04ccc21ba52eea761 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Fri, 12 Jul 2024 11:50:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E4=B8=8A=E6=8A=A5=E6=96=87=E6=9C=AC=E6=A1=86?=
 =?UTF-8?q?=E5=8A=A0placeholder?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1198661176885248]后端-服务上报文本框加placeholder http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1198661176885248
---
 .../framework/process/dto/ProcessTaskStepVo.java       | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/main/java/neatlogic/framework/process/dto/ProcessTaskStepVo.java b/src/main/java/neatlogic/framework/process/dto/ProcessTaskStepVo.java
index 2012dd90..b589dd34 100644
--- a/src/main/java/neatlogic/framework/process/dto/ProcessTaskStepVo.java
+++ b/src/main/java/neatlogic/framework/process/dto/ProcessTaskStepVo.java
@@ -91,6 +91,8 @@ public class ProcessTaskStepVo extends BasePageVo {
     private Integer isNeedUploadFile;
     @EntityField(name = "是否需要回复框", type = ApiParamType.INTEGER)
     private Integer isNeedContent;
+    @EntityField(name = "回复框帮助", type = ApiParamType.STRING)
+    private String contentHelp;
     @EntityField(name = "回复是否必填", type = ApiParamType.INTEGER)
     private Integer isRequired;
     @EntityField(name = "启用重审", type = ApiParamType.INTEGER)
@@ -355,6 +357,14 @@ public class ProcessTaskStepVo extends BasePageVo {
         return isNeedContent;
     }
 
+    public String getContentHelp() {
+        return contentHelp;
+    }
+
+    public void setContentHelp(String contentHelp) {
+        this.contentHelp = contentHelp;
+    }
+
     public Integer getEnableReapproval() {
         if (enableReapproval == null && StringUtils.isNotBlank(configHash)) {
             enableReapproval = ProcessStepInternalHandlerFactory.getHandler().getEnableReapprovalByConfigHash(configHash);
-- 
Gitee


From 295293832ac4cab8abe6f7e089523c38b7065193 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Fri, 12 Jul 2024 14:46:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E4=B8=8A=E6=8A=A5=E6=96=87=E6=9C=AC=E6=A1=86?=
 =?UTF-8?q?=E5=8A=A0placeholder?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1198661176885248]后端-服务上报文本框加placeholder http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1198661176885248
---
 .../framework/process/dto/ChannelVo.java      | 38 ++++---------------
 1 file changed, 7 insertions(+), 31 deletions(-)

diff --git a/src/main/java/neatlogic/framework/process/dto/ChannelVo.java b/src/main/java/neatlogic/framework/process/dto/ChannelVo.java
index 89fe5304..14a76c29 100644
--- a/src/main/java/neatlogic/framework/process/dto/ChannelVo.java
+++ b/src/main/java/neatlogic/framework/process/dto/ChannelVo.java
@@ -71,14 +71,8 @@ public class ChannelVo extends BasePageVo {
     @EntityField(name = "默认优先级", type = ApiParamType.STRING)
     private String defaultPriorityUuid;
 
-    @EntityField(name = "是否显示上报页描述", type = ApiParamType.INTEGER)
-    private Integer allowDesc;
-
-    @EntityField(name = "描述帮助", type = ApiParamType.STRING)
-    private String help;
-
-    @EntityField(name = "是否激活描述帮助", type = ApiParamType.INTEGER)
-    private Integer isActiveHelp;
+    @EntityField(name = "工单上报页描述文本占位符", type = ApiParamType.STRING)
+    private String contentHelp;
 
     @EntityField(name = "时效", type = ApiParamType.INTEGER)
     private Integer sla;
@@ -136,9 +130,7 @@ public class ChannelVo extends BasePageVo {
         this.icon = channelVo.icon;
         this.color = channelVo.color;
         this.parentUuid = channelVo.parentUuid;
-        this.allowDesc = channelVo.allowDesc;
-        this.help = channelVo.help;
-        this.isActiveHelp = channelVo.isActiveHelp;
+        this.contentHelp = channelVo.contentHelp;
         this.sla = channelVo.sla;
         this.channelTypeUuid = channelVo.channelTypeUuid;
         this.support = channelVo.support;
@@ -274,28 +266,12 @@ public class ChannelVo extends BasePageVo {
         this.defaultPriorityUuid = defaultPriorityUuid;
     }
 
-    public Integer getAllowDesc() {
-        return allowDesc;
-    }
-
-    public void setAllowDesc(Integer allowDesc) {
-        this.allowDesc = allowDesc;
-    }
-
-    public String getHelp() {
-        return help;
-    }
-
-    public void setHelp(String help) {
-        this.help = help;
-    }
-
-    public Integer getIsActiveHelp() {
-        return isActiveHelp;
+    public String getContentHelp() {
+        return contentHelp;
     }
 
-    public void setIsActiveHelp(Integer isActiveHelp) {
-        this.isActiveHelp = isActiveHelp;
+    public void setContentHelp(String contentHelp) {
+        this.contentHelp = contentHelp;
     }
 
     public Integer getSla() {
-- 
Gitee