Commit Graph

128 Commits

Author SHA1 Message Date
chenbowen
d8882188ef Merge remote-tracking branch 'base-version/main' into dev
# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
#	zt-module-infra/zt-module-infra-api/src/main/java/com/zt/plat/module/infra/api/websocket/WebSocketSenderApi.java
#	zt-module-infra/zt-module-infra-server/src/main/resources/application-dev.yaml
2025-12-01 10:21:34 +08:00
chenbowen
6dace51774 1. 剔除掉多余的文档以及标记 2025-11-28 18:12:00 +08:00
chenbowen
23b716a843 Merge remote-tracking branch 'base-version/main' into dev
# Conflicts:
#	zt-module-bpm/zt-module-bpm-server/src/main/java/liquibase/database/core/DmDatabase.java
2025-11-27 16:35:49 +08:00
chenbowen
ae451f9062 修复 flowable 无法通过 dm 数据库驱动正常获取 schema 的bug 2025-11-27 16:01:05 +08:00
chenbowen
224a83f7e7 修复 dm jdbc 不兼容 flowable 转义 sql 的错误 2025-11-27 13:26:30 +08:00
chenbowen
e909649eac 禁止事件引擎重复自动建表 2025-11-27 11:16:49 +08:00
chenbowen
f5f06f503b flowable 达梦迁移 2025-11-27 09:58:44 +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
qianshijiang
b1920b7b47 nacos配置 2025-11-26 08:58:10 +08:00
chenbowen
05967b855b 1. 同步 nacos 配置到业务系统 2025-11-25 18:54:39 +08:00
chenbowen
aa688680d3 1. 修复升级私有包版本错误 2025-11-25 09:54:36 +08:00
chenbowen
4029beca5b 1. 升级私有包版本 2025-11-25 09:37:44 +08:00
chenbowen
ae48f77d9d Merge branch 'dev' into test 2025-11-19 15:44:39 +08:00
chenbowen
13d3016a53 1. 升级私有包版本 2025-11-19 14:48:09 +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
chenbowen
63490962bb 1. 调整业务 pod 资源检查的延时 2025-11-06 14:04:31 +08:00
chenbowen
5613cc4209 1. 调整 bpm 资源 2025-11-06 13:58:19 +08:00
chenbowen
aae4f1cbda 1. 修复 base 编译错误
2. build 追加 skywalking 集成
2025-11-06 09:23:43 +08:00
chenbowen
cea6ff4a52 1. 新增业务系统日志收集 2025-11-06 00:49:53 +08:00
chenbowen
f7af0cad09 1. 新增业务系统日志收集 2025-11-06 00:41:57 +08:00
chenbowen
947c867526 1. 新增业务系统日志收集 2025-11-06 00:37:48 +08:00
chenbowen
8e43f3e2a3 1. 新增业务系统日志收集 2025-11-06 00:28:14 +08:00
chenbowen
d6d7858c1b Merge branch 'dev' into test
# Conflicts:
#	zt-module-bpm/zt-module-bpm-server/pom.xml
2025-10-29 18:30:14 +08:00
chenbowen
da0214b2a4 ZT 远程仓库依赖强制更新 2025-10-29 18:23:28 +08:00
chenbowen
460baf050f 修复未同步的 bpm 版本错误 2025-10-28 16:54:26 +08:00
chenbowen
d36dd2aee2 Merge branch 'dev' into test
# Conflicts:
#	pom.xml
2025-10-28 14:47:55 +08:00
chenbowen
1d056119eb 更新版本 2025-10-28 14:47:29 +08:00
chenbowen
3ec1be28e2 Merge branch 'dev' into test
# Conflicts:
#	pom.xml
2025-10-28 14:46:04 +08:00
chenbowen
6b3acc955c 更新版本 2025-10-28 14:45:35 +08:00
chenbowen
5d1a685c9e 模块独立命名 2025-10-22 16:06:26 +08:00
chenbowen
bac1c4d322 Merge remote-tracking branch 'base-version/main' into dev 2025-10-17 17:45:33 +08:00
chenbowen
10df09b9bb 1. 新增外部系统编码部门编码关联管理
2. 新增统一的 api 对外门户管理
3. 修正各个模块的 api 命名
2025-10-17 17:40:46 +08:00
chenbowen
3fa9312a56 升级版本 2025-10-15 16:18:03 +08:00
chenbowen
b1edfba21c 升级版本 2025-10-15 16:15:45 +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
yueyi
c44f75b2cc 修改生产管理API版本号 2025-10-10 13:47:44 +08:00
yueyi
469558c87d Merge branch 'dev' into test 2025-10-10 10:25:15 +08:00
yueyi
61c04b7f36 工艺流程审批监听 2025-10-10 10:12:43 +08:00
chenbowen
db955ab469 修复 bpm 部署资源文件 2025-09-30 12:02:13 +08:00
chenbowen
3b5ffb8704 修复 bpm 部署资源文件 2025-09-30 11:16:10 +08:00