wangli 531e46095f Merge branch 'refs/heads/feature/merged_all_req' into feature/starter ... # Conflicts: # workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessActivityApi.java # workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessInstanceApi.java # workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessTaskApi.java # workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/manage/ProcessCategoryApi.java # workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/manage/ProcessConfigApi.java # workflow-engine-common/src/main/java/cn/axzo/workflow/common/constant/BpmnConstants.java # workflow-engine-core/src/main/java/cn/axzo/workflow/core/mq/CustomRocketMQEventProducer.java		2024-06-06 09:34:48 +08:00
..
main	Merge branch 'refs/heads/feature/merged_all_req' into feature/starter	2024-06-06 09:34:48 +08:00