Commit Graph

683 Commits

Author SHA1 Message Date
chenbowen
4518b893a9 Merge remote-tracking branch 'base-version/main' into dev 2026-01-07 15:50:33 +08:00
chenbowen
64de518d4c 1.新增签名日志 2026-01-07 15:49:10 +08:00
chenbowen
b86a9a2811 Merge remote-tracking branch 'base-version/main' into dev 2026-01-06 15:24:13 +08:00
chenbowen
09c9276deb 1. 修复 CompanyDataPermissionIgnoreAspect 空指针问题 2026-01-06 11:17:20 +08:00
chenbowen
797cd2abd9 1. 修复 deptignore 注解会导致的空指针问题
2. 延长 databus 默认的请求超时时间
3. 调整初始化脚本部分字段的长度
2026-01-06 09:18:47 +08:00
maimaishu
88b280a33f [+]增加IWork根据ID同步接口 2026-01-05 11:33:11 +08:00
maimaishu
2e761d1867 [+]增加部门推动消息功能 2026-01-02 17:27:53 +08:00
ranke
7bd44ffca9 新增根据流程实例ID获取抄送记录的接口,用于待办详情中展示 2025-12-31 17:06:51 +08:00
maimaishu
3ad65780a6 Merge branch 'test' of http://172.16.46.63:30001/gitlab/base-version/ztcloud into test 2025-12-31 16:57:00 +08:00
maimaishu
3573217507 [+]增加部门推动消息功能 2025-12-31 16:55:20 +08:00
qianshijiang
b155b1a00a 数据库配置修改 2025-12-31 16:36:01 +08:00
chenbowen
6ac7511019 新增忽略公司以及部门数据权限的注解 2025-12-30 18:38:07 +08:00
chenbowen
5d547acfea Merge remote-tracking branch 'refs/remotes/base-version/test' into dev 2025-12-30 18:28:57 +08:00
chenbowen
4579259973 1. 恢复发布私服库的指向 2025-12-30 18:27:47 +08:00
ranke
b81e8c6df2 新增根据流程管控按钮是否可用配置功能. http://172.16.46.63:31560/index.php?m=task&f=view&taskID=551 2025-12-30 18:07:58 +08:00
hewencai
812e9727ae fix:添加seata达梦数据库兼容补丁 2025-12-29 16:16:06 +08:00
chenbowen
580d1d9047 1. 补全基准的菜单 sql 语句 2025-12-29 11:13:29 +08:00
hewencai
8e8acd6aaf fix:修复seata2.4版本下达梦数据库回滚异常问题,增加调试日志 2025-12-29 09:54:36 +08:00
hewencai
bca34ea437 Merge remote-tracking branch 'origin/dev' into dev 2025-12-29 09:53:18 +08:00
hewencai
8b469710ce fix:修复seata2.4版本下达梦数据库回滚异常问题,增加调试日志 2025-12-29 09:53:00 +08:00
chenbowen
91b54cc9d1 1. 新增 seata 兼容模块打包 2025-12-25 18:19:46 +08:00
hewencai
1d4380adc1 Merge remote-tracking branch 'origin/dev' into dev 2025-12-25 17:44:54 +08:00
hewencai
666008e3c6 fix:修复seata2.4版本下达梦数据库回滚异常问题 2025-12-25 17:44:34 +08:00
chenbowen
1c2e8e1332 Merge remote-tracking branch 'base-version/main' into dev 2025-12-25 17:31:32 +08:00
chenbowen
e6fc24d3b1 1. 目前涉及到太多没有租户的场景,默认使用主租户兜底 2025-12-25 17:29:45 +08:00
chenbowen
b698706dad Merge remote-tracking branch 'base-version/main' into dev 2025-12-25 10:47:20 +08:00
chenbowen
09c726d51b 1. 避免无登录的操作无法记录日志的情况
2. 短信登录可以不传递租户信息
2025-12-25 10:46:45 +08:00
chenbowen
ab3104cff7 Merge remote-tracking branch 'base-version/main' into dev 2025-12-24 14:30:39 +08:00
chenbowen
89a047d28b 1. 提升 infra 可以上传的附件大小 2025-12-24 14:30:03 +08:00
hewencai
3903b73905 Merge remote-tracking branch 'ztcloud/main' into main-ztcloud
# Conflicts:
#	zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/dept/DeptService.java
2025-12-24 11:15:23 +08:00
hewencai
8823e316a0 update:调整数据同步用户-部门,用户-岗位同步逻辑 2025-12-24 11:04:49 +08:00
hewencai
01847264d5 update:调整数据同步用户-部门,用户-岗位同步逻辑 2025-12-24 11:04:48 +08:00
hewencai
516198ab53 update:调整数据同步用户-部门,用户-岗位同步逻辑 2025-12-24 11:04:45 +08:00
hewencai
7f54e7f07d update:升级seata版本到2.4.0 2025-12-24 11:04:05 +08:00
hewencai
7ef5545dc0 update:调整数据同步用户-部门,用户-岗位同步顺序 2025-12-24 11:04:03 +08:00
hewencai
9b0e63a33e update:调整数据同步用户-部门,用户-岗位同步顺序 2025-12-24 11:04:01 +08:00
hewencai
2baede83e5 update:调整数据同步生产topic生成器 2025-12-24 11:03:59 +08:00
hewencai
bf27ebd5ba update:调整数据同步用户-部门,用户-岗位同步逻辑 2025-12-24 10:42:18 +08:00
hewencai
2dc0de96a3 update:调整数据同步用户-部门,用户-岗位同步逻辑 2025-12-24 10:41:51 +08:00
hewencai
a411da6754 Merge remote-tracking branch 'origin/dev' into dev 2025-12-24 10:36:17 +08:00
hewencai
9485d94574 update:调整数据同步用户-部门,用户-岗位同步逻辑 2025-12-24 10:36:00 +08:00
chenbowen
f526dd54b9 Merge remote-tracking branch 'base-version/main' into dev 2025-12-24 10:15:27 +08:00
chenbowen
7e87465ef9 1. 修正有误的短信配置 2025-12-24 10:14:52 +08:00
hewencai
1ac2f1e2cc Merge remote-tracking branch 'origin/dev' into dev 2025-12-23 18:21:13 +08:00
hewencai
7661982447 update:升级seata版本到2.4.0 2025-12-23 18:20:42 +08:00
chenbowen
5843e2eb7a Merge remote-tracking branch 'refs/remotes/base-version/main' into dev 2025-12-23 17:52:55 +08:00
chenbowen
82ea639cdd 1. 去掉凭证唯一约束 2025-12-23 16:36:35 +08:00
chenbowen
7b1991cc1c 1. 修复 get 请求时,转义后的字符串解析签名会存在问题 2025-12-23 16:36:06 +08:00
chenbowen
fe1cae483b Merge remote-tracking branch 'base-version/main' into dev 2025-12-23 13:01:48 +08:00
chenbowen
ca87ed3c52 1. 暂时简化掉所有的物流模块以及 erp 模块数据权限 2025-12-23 11:59:32 +08:00