From 6438f805266954874a2ddf345cd6e776f5854b0d Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: 星期一, 08 四月 2024 13:57:14 +0800
Subject: [PATCH] fix: easy-retry 3.2.0升级修复 1. SQLServer,Oracle的IDENTITY字段不能插入值 2. SQLServer er_system_user_=> er_system_user 3. ruoyi-admin增加token配置
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java
index 44b1bec..eb09d4f 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java
@@ -115,7 +115,7 @@
@RepeatSubmit()
@PutMapping("/migrationDefinition/{currentProcessDefinitionId}/{fromProcessDefinitionId}")
public R<Void> migrationDefinition(@NotBlank(message = "褰撳墠娴佺▼瀹氫箟id") @PathVariable String currentProcessDefinitionId,
- @NotBlank(message = "闇�瑕佽縼绉诲埌鐨勬祦绋嬪畾涔塱d") @PathVariable String fromProcessDefinitionId) {
+ @NotBlank(message = "闇�瑕佽縼绉诲埌鐨勬祦绋嬪畾涔塱d") @PathVariable String fromProcessDefinitionId) {
return toAjax(actProcessDefinitionService.migrationDefinition(currentProcessDefinitionId, fromProcessDefinitionId));
}
@@ -139,8 +139,8 @@
*/
@Log(title = "娴佺▼瀹氫箟绠＄悊", businessType = BusinessType.INSERT)
@PostMapping("/deployByFile")
- public R<Void> deployByFile(@RequestParam("file") MultipartFile file, @RequestParam("categoryCode") String categoryCode) {
- return toAjax(actProcessDefinitionService.deployByFile(file, categoryCode));
+ public void deployByFile(@RequestParam("file") MultipartFile file, @RequestParam("categoryCode") String categoryCode) {
+ actProcessDefinitionService.deployByFile(file, categoryCode);
}
}
--
Gitblit v1.9.3