|
|
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 |
|
|
|
e8e784df8e
|
Merge remote-tracking branch 'origin/master' into dev
|
2026-01-20 13:45:36 +08:00 |
|
|
|
061264fb30
|
fix - 跳转实例事件抽象类的方法名
|
2026-01-20 13:44:45 +08:00 |
|
|
|
a90ea1950e
|
Merge branch 'feature/dingdingLogin' into dev
|
2026-01-19 11:08:54 +08:00 |
|
|
|
ca47825a2e
|
fix - 测试 chrome 浏览器扫码后不能正确跳转到操作页
|
2026-01-19 11:08:21 +08:00 |
|
|
|
17e8230e0b
|
fix - 测试 chrome 浏览器扫码后不能正确跳转到操作页
|
2026-01-16 14:40:15 +08:00 |
|
|
|
4a0db17950
|
Merge branch 'feature/dingdingLogin' into dev
|
2026-01-14 17:08:35 +08:00 |
|
|
|
84cc69dad3
|
fix - 调整登陆成功后的页面地址
|
2026-01-14 17:08:00 +08:00 |
|
|
|
84a2eabeb3
|
Merge branch 'feature/dingdingLogin' into dev
|
2026-01-14 16:37:43 +08:00 |
|
|
|
e9e2c026ad
|
fix - 调整登陆成功后的页面地址
|
2026-01-14 16:37:24 +08:00 |
|
|
|
d01291624d
|
Merge branch 'feature/dingdingLogin' into dev
|
2026-01-14 16:05:26 +08:00 |
|
|
|
f577b818bc
|
fix - 调整登陆成功后的页面地址
|
2026-01-14 16:04:45 +08:00 |
|
|
|
3620bf6f60
|
Merge branch 'feature/dingdingLogin' into dev
|
2026-01-14 15:43:58 +08:00 |
|
|
|
040e4a3365
|
fix - 增加登陆安全校验
|
2026-01-14 15:11:15 +08:00 |
|
|
|
86dd6f7c7f
|
fix - 增加登陆安全校验
|
2026-01-14 11:14:15 +08:00 |
|
wangli
|
6178656710
|
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-14 10:17:32 +08:00 |
|
wangli
|
ca2a2aca5c
|
Merge remote-tracking branch 'origin/master' into feature/dingdingLogin
|
2026-01-14 10:14:05 +08:00 |
|
wangli
|
f0347133ca
|
feat(REQ-3845) - 调整替换变量的问题
|
2026-01-14 10:08:59 +08:00 |
|
wangli
|
44bb30f4a9
|
Merge branch 'feature/RDMP-3845'
# 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-14 10:07:41 +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 |
|
|
|
d16c45ae50
|
feature/dingdingLogin: 新增钉钉授权
|
2026-01-13 18:33:52 +08:00 |
|
|
|
1fda179385
|
feature/dingdingLogin: 新增钉钉授权
|
2026-01-13 18:33:25 +08:00 |
|
|
|
f87ae7cdbc
|
feature/dingdingLogin: 新增钉钉授权
|
2026-01-13 18:04:17 +08:00 |
|
|
|
d8bee2c6a3
|
fix - 处理生产环境发现的字符串"null"的异常处理问题
|
2026-01-12 10:51:54 +08:00 |
|
wangli
|
384017d1ab
|
Merge branch 'feature/RDMP-3845' into dev
|
2026-01-06 09:51:24 +08:00 |
|
wangli
|
04533576c7
|
feat(REQ-3845) - 调整替换变量的问题
|
2026-01-06 09:50:47 +08:00 |
|
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 |
|