FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
This commit is contained in:
yinglong zhang
2021-07-07 09:54:08 +08:00
parent 9a00280ba0 9f856079ee
commit f91b481180
8 changed files with 56 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
+2 -2
View File
@@ -13,8 +13,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
@FeignClient(value = "bat-wkflow")
//@FeignClient(value = "shan")
//@FeignClient(value = "bat-wkflow")
@FeignClient(value = "shan")
public interface workFlowFeignClient {
@RequestMapping(value = "/bat-wkflow/activiti_define_start_user",method = RequestMethod.GET)
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+1 -1
View File
@@ -213,7 +213,7 @@ public class WorkFlowController {
@ApiOperation(value = "完成任务")
@PostMapping("/completeTask")
public Wrapper<String> completeTaskByUserId(BusMes busMes){
public Wrapper<String> completeTaskByUserId( BusMes busMes){
Wrapper<String> str = workFlowFeignClient.completeTaskByUserId(busMes);
if(str.getCode() == 500){
str.setSuccess(false);