Merge remote-tracking branch 'base-version/main' into dev

# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
#	zt-module-infra/zt-module-infra-api/src/main/java/com/zt/plat/module/infra/api/websocket/WebSocketSenderApi.java
#	zt-module-infra/zt-module-infra-server/src/main/resources/application-dev.yaml

zt-module-bpm-server/pom.xml

@@ -84,7 +84,7 @@
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
 
-        <!-- 服务保障相关 TODO 芋艿：暂时去掉 -->
+        <!-- 服务保障相关 TODO ZT：暂时去掉 -->
         <!--        <dependency>-->
         <!--            <groupId>com.zt.plat</groupId>-->
         <!--            <artifactId>zt-spring-boot-starter-protection</artifactId>-->

zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/base/user/UserSimpleBaseVO.java

@@ -9,7 +9,7 @@ public class UserSimpleBaseVO {
 
     @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Long id;
-    @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT")
     private String nickname;
     @Schema(description = "用户头像", example = "https://www.iocoder.cn/1.png")
     private String avatar;

zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/BpmModelController.java

@@ -60,7 +60,7 @@ public class BpmModelController {
 
     @GetMapping("/list")
     @Operation(summary = "获得模型分页")
-    @Parameter(name = "name", description = "模型名称", example = "芋艿")
+    @Parameter(name = "name", description = "模型名称", example = "ZT")
     public CommonResult<List<BpmModelRespVO>> getModelList(@RequestParam(value = "name", required = false) String name) {
         List<Model> list = modelService.getModelList(name);
         if (CollUtil.isEmpty(list)) {

zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/form/BpmFormPageReqVO.java

@@ -8,7 +8,7 @@ import lombok.Data;
 @Data
 public class BpmFormPageReqVO extends PageParam {
 
-    @Schema(description = "表单名称", example = "芋道")
+    @Schema(description = "表单名称", example = "ZT")
     private String name;
 
 }

zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/form/BpmFormRespVO.java

@@ -14,7 +14,7 @@ public class BpmFormRespVO {
     @Schema(description = "表单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long id;
 
-    @Schema(description = "表单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "表单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT")
     @NotNull(message = "表单名称不能为空")
     private String name;
 

zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/form/BpmFormSaveReqVO.java

@@ -13,7 +13,7 @@ public class BpmFormSaveReqVO {
     @Schema(description = "表单编号", example = "1024")
     private Long id;
 
-    @Schema(description = "表单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "表单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT")
     @NotNull(message = "表单名称不能为空")
     private String name;
 

zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/group/BpmUserGroupPageReqVO.java

@@ -15,7 +15,7 @@ public class BpmUserGroupPageReqVO extends PageParam {
     @Schema(description = "编号", example = "1024")
     private Long id;
 
-    @Schema(description = "组名", example = "芋道")
+    @Schema(description = "组名", example = "ZT")
     private String name;
 
     @Schema(description = "状态", example = "1")

zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/group/BpmUserGroupRespVO.java

@@ -13,10 +13,10 @@ public class BpmUserGroupRespVO {
     @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long id;
 
-    @Schema(description = "组名", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "组名", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT")
     private String name;
 
-    @Schema(description = "描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
+    @Schema(description = "描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT源码")
     private String description;
 
     @Schema(description = "成员编号数组", requiredMode = Schema.RequiredMode.REQUIRED, example = "1,2,3")

zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/group/BpmUserGroupSaveReqVO.java

@@ -13,11 +13,11 @@ public class BpmUserGroupSaveReqVO {
     @Schema(description = "编号", example = "1024")
     private Long id;
 
-    @Schema(description = "组名", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "组名", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT")
     @NotNull(message = "组名不能为空")
     private String name;
 
-    @Schema(description = "描述", example = "芋道源码")
+    @Schema(description = "描述", example = "ZT源码")
     private String description;
 
     @Schema(description = "成员编号数组", requiredMode = Schema.RequiredMode.REQUIRED, example = "1,2,3")

zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/controller/admin/definition/vo/model/BpmModelRespVO.java

@@ -20,7 +20,7 @@ public class BpmModelRespVO extends BpmModelMetaInfoVO {
     @Schema(description = "流程标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "process_zt")
     private String key;
 
-    @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT")
     private String name;
 
     @Schema(description = "流程图标", example = "https://www.iocoder.cn/zt.jpg")