Bläddra i källkod

Merge remote-tracking branch 'origin/dev' into dev

AprilWind 11 månader sedan
förälder
incheckning
1bd40a0cff

+ 2 - 2
pom.xml

@@ -14,7 +14,7 @@
 
     <properties>
         <revision>5.2.0-BETA</revision>
-        <spring-boot.version>3.2.5</spring-boot.version>
+        <spring-boot.version>3.2.6</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>17</java.version>
@@ -34,7 +34,7 @@
         <lock4j.version>2.2.7</lock4j.version>
         <dynamic-ds.version>4.3.0</dynamic-ds.version>
         <alibaba-ttl.version>2.14.4</alibaba-ttl.version>
-        <snailjob.version>1.0.0-beta1</snailjob.version>
+        <snailjob.version>1.0.0-beta2</snailjob.version>
         <mapstruct-plus.version>1.3.6</mapstruct-plus.version>
         <mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version>
         <lombok.version>1.18.32</lombok.version>

+ 2 - 2
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java

@@ -225,7 +225,7 @@ public class ActTaskController extends BaseController {
     @RepeatSubmit()
     @PostMapping("/backProcess")
     public R<String> backProcess(@Validated({AddGroup.class}) @RequestBody BackProcessBo backProcessBo) {
-        return R.ok(actTaskService.backProcess(backProcessBo));
+        return R.ok("操作成功", actTaskService.backProcess(backProcessBo));
     }
 
     /**
@@ -279,7 +279,7 @@ public class ActTaskController extends BaseController {
      */
     @GetMapping("/getTaskUserIdsByAddMultiInstance/{taskId}")
     public R<String> getTaskUserIdsByAddMultiInstance(@PathVariable String taskId) {
-        return R.ok(actTaskService.getTaskUserIdsByAddMultiInstance(taskId));
+        return R.ok("操作成功", actTaskService.getTaskUserIdsByAddMultiInstance(taskId));
     }
 
     /**