Commit Graph

1740 Commits

Author SHA1 Message Date
4c1a3fa508 Merge branch 'feature/REQ-7125' into dev 2026-03-02 15:46:45 +08:00
b781f0b0fe feat(REQ-7125) - 调整查询指定审批的待审批任务API 入参和逻辑 2026-03-02 15:45:58 +08:00
7cc2cab7cc Merge branch 'feature/REQ-7125' into dev 2026-03-02 10:08:27 +08:00
10f0e6cdfe feat(REQ-7125) - 增加管理员指定审批人的接口及实现 2026-03-02 10:07:56 +08:00
772c6fd9b6 Merge branch 'feature/REQ-7125' into dev 2026-02-28 18:39:47 +08:00
2b106b7609 feat(REQ-7125) - 调整查询审批日志时,审批人指定按钮的处理 2026-02-28 18:38:38 +08:00
a09649af44 Merge branch 'feature/REQ-7125' into dev 2026-02-28 15:33:44 +08:00
4313158f48 feat(REQ-7125) - 查找审批人策略实现,适配“管理员指定审批人” 2026-02-28 15:33:04 +08:00
b907fe95ec Merge branch 'feature/REQ-7125' into dev 2026-02-28 13:59:15 +08:00
b04f9d00eb feat(REQ-7125) - 1. 调整系统按钮枚举 2.修改部分审批日志文案 3. 增加管理员指定审批人策略实现 2026-02-28 13:58:46 +08:00
f7c83133c7 feat(REQ-7125) - 调整中止文案为终止 2026-02-27 15:45:32 +08:00
58094bda9a Merge branch 'feature/improve_starter' into dev 2026-02-24 14:43:40 +08:00
2c0f77fd69 feat(hotfix) - 调整乐观锁的异常信息处理 2026-02-12 13:44:41 +08:00
c7da1a43dc Merge branch 'feature/hiddenLogAutoSkip' 2026-02-11 18:15:12 +08:00
da21ddbbcb feat(REQ-7380) - 调整自动处理的文案 2026-02-11 15:57:30 +08:00
a7d3fd9982 Merge branch 'feature/hiddenLogAutoSkip' into dev 2026-02-11 15:30:20 +08:00
1397e09913 feat(REQ-7380) - 调整预检查逻辑中未适配category 版本的问题 2026-02-11 15:01:30 +08:00
70abac304f Merge branch 'feature/high-bug' into release-0211 2026-02-11 10:47:48 +08:00
f370b2f4bf Merge branch 'feature/hiddenLogAutoSkip' into release-0211 2026-02-11 10:47:17 +08:00
89d4de89ff Merge branch 'feature/REQ-7129' into dev 2026-02-09 11:37:22 +08:00
d12f2b072b feat(REQ-7129) - 增加一个更新组织关系的接口 2026-02-09 11:36:32 +08:00
c480111d1a Merge branch 'feature/hiddenLogAutoSkip' into dev 2026-02-06 18:04:21 +08:00
1eea58850d feat(incompact) - 优化一些日志和文案 2026-02-06 18:02:41 +08:00
70d5edd756 Merge branch 'feature/high-bug' into dev 2026-02-05 13:42:30 +08:00
c776813430 feat(incompact) - 兼容双引号字符串转型的问题 2026-02-05 13:41:38 +08:00
8624de4fd1 hotfix - 处理高危漏洞 2026-02-04 18:32:15 +08:00
4e14d5e674 Merge branch 'feature/high-bug' into dev 2026-02-04 17:37:06 +08:00
5156a4bbe0 hotfix - 处理高危漏洞 2026-02-04 17:33:15 +08:00
e4c430b6ba Merge branch 'feature/hiddenLogAutoSkip' into dev 2026-02-04 16:32:03 +08:00
5aeec441ca feat(autoSkip) - 添加日志 2026-02-04 15:07:56 +08:00
38aa0c3db1 Merge branch 'feature/hiddenLogAutoSkip' into dev 2026-02-04 10:20:46 +08:00
f716a25a5f feat(autoSkip) - 新增如果某个节点的日志是需要隐藏的,则节点强制自动通过(跳过) 2026-02-03 17:02:43 +08:00
8f7a19664e Merge branch 'feature/dingdingLogin' into dev
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/SupportRefreshProperties.java
2026-02-02 16:54:39 +08:00
881492f821 feat(dingtalk) - 调整钉钉发送消息的模式 2026-02-02 16:53:02 +08:00
wangli
ca2a2aca5c Merge remote-tracking branch 'origin/master' into feature/dingdingLogin 2026-01-14 10:14:05 +08:00
ba7aa98c02 Merge branch 'feature/dingdingLogin' into dev
# Conflicts:
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/util/WpsUtil.java
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/manage/PrintAdminController.java
2026-01-13 18:38:30 +08:00
f87ae7cdbc feature/dingdingLogin: 新增钉钉授权 2026-01-13 18:04:17 +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
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
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
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
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
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
5197de3cf9 Merge branch 'feature/REQ-5965' into dev 2025-12-23 11:03:28 +08:00