admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
AprilWind 2024-05-27 12:23:52 +08:00
commit 1bd40a0cff
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -14,7 +14,7 @@
<properties> <properties>
<revision>5.2.0-BETA</revision> <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.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>17</java.version> <java.version>17</java.version>
@ -34,7 +34,7 @@
<lock4j.version>2.2.7</lock4j.version> <lock4j.version>2.2.7</lock4j.version>
<dynamic-ds.version>4.3.0</dynamic-ds.version> <dynamic-ds.version>4.3.0</dynamic-ds.version>
<alibaba-ttl.version>2.14.4</alibaba-ttl.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.version>1.3.6</mapstruct-plus.version>
<mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version> <mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version>
<lombok.version>1.18.32</lombok.version> <lombok.version>1.18.32</lombok.version>

4
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java
View File

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