wangli 29a2bed129 Merge branch 'featrue/micro_service' into dev ... # Conflicts: # workflow-engine-core/src/main/java/cn/axzo/workflow/core/deletage/BpmTaskCalculateDTO.java # workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/BpmActivityEventListener.java # workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/BpmProcessInstanceService.java # workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/dto/request/bpmn/process/CustomProcInstSearchDTO.java # workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/engine/EngineActivityEventListener.java # workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmProcessInstanceServiceImpl.java # workflow-engine-server/src/main/java/cn/axzo/server/controller/web/BpmProcessInstanceController.java		2023-07-31 10:24:29 +08:00
..
src/main	Merge branch 'featrue/micro_service' into dev	2023-07-31 10:24:29 +08:00
pom.xml	update - 调整版本号	2023-07-31 10:23:57 +08:00