Commit Graph

3231 Commits

Author SHA1 Message Date
wangli
e59fee3d3d Merge branch 'feature/RDMP-3845' into dev 2026-01-05 18:30:46 +08:00
wangli
0bcfc22178 feat(REQ-3845) - 调整替换变量的问题 2026-01-05 18:29:57 +08:00
10c539ba27 Merge branch 'feature/RDMP-3845' into dev
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetProcessInstanceVariablesToObjectCmd.java
2026-01-05 16:27:27 +08:00
1a75fc4de3 feat(REQ-3845) - 调整处理wps 变量替换为空串的逻辑 2026-01-05 16:26:11 +08:00
25f94a5183 Merge branch 'feature/RDMP-3845' into dev 2026-01-05 15:20:38 +08:00
bfbd1a02c3 feat(REQ-3845) - 调整处理wps 变量替换为空串的逻辑 2026-01-05 15:19:55 +08:00
8084fd62ff Merge branch 'feature/RDMP-3845' into dev
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetProcessInstanceVariablesToObjectCmd.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/AbstractBpmnEventListener.java
2026-01-05 14:49:36 +08:00
b8aac17b64 feat(REQ-3845) - 调整获取人员信息的接口 2026-01-05 14:46:58 +08:00
8557ceccb8 Merge remote-tracking branch 'origin/master' into feature/RDMP-3845
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetProcessInstanceVariablesToObjectCmd.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/AbstractBpmnEventListener.java
2026-01-05 14:40:36 +08:00
466de880f9 Merge branch 'feature/RDMP-3845' into dev 2025-12-26 18:42:32 +08:00
81965467d4 feat(REQ-3845) - 处理表单响应转换 2025-12-26 18:40:51 +08:00
aa25c534f3 Merge branch 'feature/RDMP-3845' into dev 2025-12-26 18:19:41 +08:00
83d7c6df50 feat(REQ-3845) - 处理表单响应转换 2025-12-26 18:14:02 +08:00
eaf4105711 Merge branch 'feature/REQ-5965' into dev 2025-12-26 16:47:56 +08:00
9353c76030 feat(REQ-5965) - 调整文档配置文案 2025-12-26 16:47:34 +08:00
3d88a81fa0 Merge branch 'feature/REQ-5965' into dev 2025-12-26 13:55:32 +08:00
41012e864c feat(REQ-5965) - 升级 axzo-parent 基础包版本 2025-12-26 13:55:05 +08:00
f45dea2fec Merge branch 'feature/REQ-5965' into dev
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetProcessInstanceVariablesToObjectCmd.java
2025-12-25 16:30:19 +08:00
b486ed4927 feat(REQ-5965) - 调整获取用于替换 wps 变量之前的变量逻辑,配合审批业务中的替换为空的配置使用 2025-12-25 16:28:02 +08:00
2e4cb9b998 Merge branch 'feature/REQ-5965' into dev 2025-12-25 14:24:17 +08:00
1841d86b18 feat(REQ-5965) - 调整获取用于替换 wps 变量之前的变量逻辑,配合审批业务中的替换为空的配置使用 2025-12-25 14:23:26 +08:00
376cf82fa6 Merge branch 'feature/REQ-5965' into dev 2025-12-25 13:55:17 +08:00
15644c382e feat(REQ-5965) - 增加一些日志打印 2025-12-25 13:54:49 +08:00
51743f49f3 Merge branch 'feature/REQ-5965' into dev 2025-12-25 11:25:17 +08:00
46dd5ceee5 feat(REQ-5965) - 调整审批日志打印功能日志筛选 2025-12-25 11:24:55 +08:00
7455485c02 Merge branch 'feature/REQ-5965' into dev 2025-12-25 11:10:43 +08:00
39ed649aa0 feat(REQ-5965) - 调整因为开放了更新业务变量后,导致最新 wps 变量替换不准确的问题 2025-12-25 11:09:29 +08:00
3c673c12e3 Merge branch 'feature/REQ-5965' into dev 2025-12-25 10:58:56 +08:00
02a067d49c feat(REQ-5965) - 调整过滤用于替换 wps 文档变量的逻辑 2025-12-25 10:58:20 +08:00
8b32787d4f Merge branch 'feature/REQ-5965' into dev 2025-12-24 20:31:27 +08:00
1e80220544 feat(REQ-5965) - 补充接口入参日志打印 2025-12-24 20:30:13 +08:00
115266e361 Merge branch 'feature/REQ-5965' into dev 2025-12-24 18:16:42 +08:00
f7234e9c11 feat(REQ-5965) - 调整审批业务变量未覆盖的问题 2025-12-24 18:16:19 +08:00
8a988d96b4 Merge branch 'feature/REQ-5965' into dev 2025-12-23 14:29:49 +08:00
68ec1d0be1 feat(REQ-5965) - 更新条件的 defaultValue 数据类型 2025-12-23 14:29:10 +08:00
5197de3cf9 Merge branch 'feature/REQ-5965' into dev 2025-12-23 11:03:28 +08:00
678048bf4a feat(REQ-5965) - 更新变量 2025-12-23 10:51:17 +08:00
d3f845c49b feat(REQ-5965) - 调整条件设置的类型 2025-12-23 10:37:20 +08:00
66d348e67e feat(REQ-5965) - 获取条件设置的值 2025-12-22 17:30:53 +08:00
006932a9e5 Merge branch 'feature/REQ-5965' into dev 2025-12-22 14:23:02 +08:00
ecdd054c12 feat(REQ-5965) - 调整处理条件变量字段的逻辑 2025-12-22 14:21:15 +08:00
253e8d4eb6 Merge branch 'feature/REQ-5965' into dev 2025-12-22 14:15:37 +08:00
f5415dd354 feat(REQ-5965) - 处理图片类型为空时,设置为透明默认图 2025-12-22 14:14:10 +08:00
a1cb68cafa Merge branch 'feature/REQ-5965' into dev 2025-12-22 11:09:10 +08:00
94b9a0848c feat(REQ-5965) - 兼容历史的存储模式 2025-12-22 11:08:40 +08:00
6af33ce3b6 Merge remote-tracking branch 'origin/dev' into dev 2025-12-22 10:41:12 +08:00
24db7ff862 Merge branch 'feature/REQ-5965' into dev 2025-12-22 10:40:52 +08:00
34d4cdea1e feat(REQ-5965) - 调整单选复现条件的存储模式 2025-12-22 10:40:06 +08:00
a7dc35862a Merge remote-tracking branch 'origin/master' into feature/REQ-5965
# Conflicts:
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessActivityController.java
2025-12-22 10:17:24 +08:00
05e7ad4563 feat(REQ-5965) - 调整原来的方法 2025-12-22 10:15:33 +08:00