From be14f71ab9df6cd75d207831d125295e61bb54ab Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Tue, 21 Nov 2023 15:03:41 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E4=BF=AE=E6=94=B9=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=B5=81=E9=BB=98=E8=AE=A4=E6=8C=89=E9=92=AE=E7=9A=84?=
 =?UTF-8?q?=E5=85=83=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/axzo/workflow/common/model/dto/CooperationOrgDTO.java    | 2 +-
 .../request/bpmn/process/BpmnProcessInstanceCreateDTO.java      | 2 +-
 .../server/controller/web/business/ProcessConfigController.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/dto/CooperationOrgDTO.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/dto/CooperationOrgDTO.java
index 09c4ac605..cd896c5dd 100644
--- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/dto/CooperationOrgDTO.java
+++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/dto/CooperationOrgDTO.java
@@ -34,7 +34,7 @@ public class CooperationOrgDTO implements Serializable {
     @Builder
     @NoArgsConstructor
     @AllArgsConstructor
-    public static class OrgScope {
+    public static class OrgScope implements Serializable {
         /**
          * 工作台类型
          */
diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/process/BpmnProcessInstanceCreateDTO.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/process/BpmnProcessInstanceCreateDTO.java
index 0d8298446..3d6ac13cd 100644
--- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/process/BpmnProcessInstanceCreateDTO.java
+++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/process/BpmnProcessInstanceCreateDTO.java
@@ -32,7 +32,7 @@ public class BpmnProcessInstanceCreateDTO {
     /**
      * 模型归属租户 ID
      * <p>
-     * 可为空,为空时,默认使用发起人的租户 ID
+     * 为空时,默认是编辑公共流程模型, 如果是代运营创建,则必填
      */
     @ApiModelProperty(value = "发起的模型是属于哪个租户")
     private String tenantId;
diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/business/ProcessConfigController.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/business/ProcessConfigController.java
index a2de8b655..18ddfab9f 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/business/ProcessConfigController.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/business/ProcessConfigController.java
@@ -33,7 +33,7 @@ public class ProcessConfigController implements ProcessConfigApi {
                 .map(buttonEnum -> new BpmnButtonMetaInfo()
                         .setOrder(buttonEnum.getOrder())
                         .setBtnKey(buttonEnum.getBtnKey())
-                        .setBtnName(buttonEnum.getBtnKey())
+                        .setBtnName(buttonEnum.getBtnName())
                         .setChecked(false)
                         .setDisabled(false)).collect(Collectors.toList()));
     }