57 Commits

Author SHA1 Message Date
FCL
94fb3abe8c Merge branch 'refs/heads/zt-test' into test 2026-02-04 11:49:39 +08:00
chenbowen
c772532d3f Merge branch 'dev' into test 2026-02-03 11:19:55 +08:00
chenbowen
3377c357de Revert "移除多余的依赖"
This reverts commit 667ee852da.
2026-02-03 11:18:30 +08:00
chenbowen
04254e16ac Merge branch 'dev' into test
# Conflicts:
#	zt-module-bpm/zt-module-bpm-server/src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java
#	zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/framework/rpc/config/RpcConfiguration.java
#	zt-module-bpm/zt-module-bpm-server/src/main/java/liquibase/datatype/core/BooleanType.java
#	zt-module-bpm/zt-module-bpm-server/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfiguration.java
2026-02-03 10:37:34 +08:00
chenbowen
82ceb1f18b 保留覆盖的源码 2026-02-03 10:36:45 +08:00
chenbowen
667ee852da 移除多余的依赖 2026-01-30 17:45:14 +08:00
ranke
f0df2ceec7 修改dockerfile 2026-01-30 14:26:59 +08:00
ranke
1c62711f74 删除与 ztcloud 的 bpm 中重复的代码, 改为以jar包方式引入 ztcloud 的bpm 2026-01-30 11:46:25 +08:00
FCL
01788350f3 Merge branch 'refs/heads/zt-test' into test 2026-01-29 10:21:05 +08:00
chenbowen
ce3e6f2577 Merge branch 'main' into test
# Conflicts:
#	deployment.yaml
#	pom.xml
2026-01-27 17:54:23 +08:00
FCL
85ef3b75fe Merge branch 'refs/heads/zt-test' into test 2026-01-19 10:56:11 +08:00
chenbowen
faa6de5965 Merge branch 'dev' into test
# Conflicts:
#	zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/framework/rpc/config/RpcConfiguration.java
2026-01-14 14:08:27 +08:00
chenbowen
98d585a9ae 1. 合并 bpm 版本 2026-01-14 14:07:45 +08:00
chenbowen
28284835cc Merge branch 'refs/heads/test' 2026-01-12 18:46:29 +08:00
chenbowen
234ab78ba9 1. 合并 达梦数据库兼容改动 2026-01-12 17:11:30 +08:00
chenbowen
8d23ba8504 Merge branch 'dev' into test
# Conflicts:
#	zt-module-bpm/zt-module-bpm-server/Dockerfile
2026-01-12 16:39:02 +08:00
chenbowen
a693c2d91e 1. bpm 模块整合合并 2026-01-12 16:38:14 +08:00
chenbowen
9ad0b03b6b 1. 提出私服 skywalking 的依赖,使用 ZStack 自带链路追踪 2026-01-12 15:36:37 +08:00
FCL
5cbc445cf7 代码合并 2026-01-09 13:54:33 +08:00
chenbowen
8058f26c7b 1. 调整部署配置 2026-01-06 14:45:48 +08:00
chenbowen
1e9f6de7d1 1. 调整部署配置 2026-01-06 09:33:42 +08:00
FCL
32bb22d6b6 Merge branch 'dev' into test 2025-12-23 09:35:22 +08:00
FCL
f16243441e fix:qms模块监听 2025-12-23 09:34:58 +08:00
FCL
f06e0a4d5c feat:报告流程回调优化;转pdf;发起iwork流程; 2025-12-16 16:11:09 +08:00
FCL
39ff226c9b Merge branch 'refs/heads/zt-test' into test 2025-12-11 10:17:55 +08:00
chenbowen
b4805414c5 1. 提出私服 skywalking 的依赖,使用 ZStack 自带链路追踪 2025-12-03 20:32:06 +08:00
qianshijiang
b3b324e0d9 错误信息未记录日志文件 2025-11-26 15:45:14 +08:00
qianshijiang
c327678aa4 错误信息未记录日志文件 2025-11-26 15:35:26 +08:00
qianshijiang
3e88f2a647 日志配置修改 2025-11-26 10:36:46 +08:00
FCL
be44c5b4f3 Merge branch 'refs/heads/zt-test' into test
# Conflicts:
#	zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/service/qms/listener/QmsTaskListener.java
2025-11-25 10:01:43 +08:00
FCL
f2dffc6ef0 Merge branch 'dev' into test 2025-11-18 15:00:09 +08:00
FCL
e257273b13 feat:qms模块监听 2025-11-18 14:59:28 +08:00
FCL
265d317e3e Merge branch 'refs/heads/zt-test' into test
# Conflicts:
#	pom.xml
2025-11-18 10:11:53 +08:00
chenbowen
aae4f1cbda 1. 修复 base 编译错误
2. build 追加 skywalking 集成
2025-11-06 09:23:43 +08:00
FCL
abb2d31d11 fix:报告流程回调优化 2025-11-03 11:54:58 +08:00
FCL
22ad11a246 feat:报告流程回调、手写签名 2025-10-29 15:27:02 +08:00
chenbowen
460baf050f 修复未同步的 bpm 版本错误 2025-10-28 16:54:26 +08:00
chenbowen
5d1a685c9e 模块独立命名 2025-10-22 16:06:26 +08:00
FCL
232709629e feat:更新版本 2025-10-21 16:08:07 +08:00
FCL
1f80be555f Merge branch 'refs/heads/zt-test' into test
# Conflicts:
#	zt-module-bpm/zt-module-bpm-server/pom.xml
2025-10-21 14:50:16 +08:00
FCL
4bf96508a1 feat:代码合并、流程回调监听 2025-10-21 14:49:12 +08:00
FCL
d331c9f441 feat:修改bpm模块依赖 2025-10-21 11:13:13 +08:00
qianshijiang
912c26ce37 Merge remote-tracking branch 'origin/dev' into test 2025-10-15 14:34:11 +08:00
qianshijiang
72bca7a98d 请款单流程回调 2025-10-15 14:33:31 +08:00
qianshijiang
5a7de203df Merge remote-tracking branch 'origin/dev' into test 2025-10-15 10:43:18 +08:00
qianshijiang
fd355f29b3 请款单流程回调 2025-10-14 11:34:51 +08:00
niuhb
6d9b5b82bc Merge branch 'dev' into test 2025-10-10 15:33:02 +08:00
niuhb
82e5bb91a0 注册生产计划feign接口 2025-10-10 15:32:46 +08:00
niuhb
9453757324 Merge branch 'dev' into test 2025-10-10 14:26:32 +08:00
niuhb
3d54b2cf73 新增生产计划模块审批回调监听 2025-10-10 14:21:24 +08:00