yangqicheng c036742415 Merge remote-tracking branch 'refs/remotes/origin/master' into feature/REQ-2924 ... # Conflicts: # workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessActivityApi.java # workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/FlowableConfiguration.java # workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/BpmnProcessActivityService.java # workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessActivityServiceImpl.java # workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowCoreService.java # workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowManageService.java # workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/feign/ext/ComplexInvokeClient.java		2024-09-25 17:49:37 +08:00
..
src/main	Merge remote-tracking branch 'refs/remotes/origin/master' into feature/REQ-2924	2024-09-25 17:49:37 +08:00
pom.xml	update(REQ-2516) - 移除 workflow-auto-gen 模块	2024-06-12 15:51:31 +08:00