chenbowen
|
1316d09626
|
Merge branch 'dev' into test
|
2025-12-25 17:31:52 +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
|
d9ab32165f
|
Merge branch 'dev' into test
|
2025-12-25 10:47:38 +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
|
52f7a8f28b
|
Merge branch 'dev' into test
|
2025-12-24 14:31:02 +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 |
|
wencai he
|
25be319941
|
Merge branch 'dev' into 'test'
Dev
See merge request jygk/dsc!15
|
2025-12-24 02:42:20 +00:00 |
|
hewencai
|
bf27ebd5ba
|
update：调整数据同步用户-部门，用户-岗位同步逻辑
|
2025-12-24 10:42:18 +08:00 |
|
hewencai
|
2dc0de96a3
|
update：调整数据同步用户-部门，用户-岗位同步逻辑
|
2025-12-24 10:41:51 +08:00 |
|
wencai he
|
0fdfce0626
|
Merge branch 'dev' into 'test'
Dev
See merge request jygk/dsc!14
|
2025-12-24 02:37:39 +00: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
|
433e2fb4de
|
1. 修改每日最大发送次数
|
2025-12-24 10:27:57 +08:00 |
|
chenbowen
|
b9c44ebf91
|
Merge branch 'dev' into test
|
2025-12-24 10:15:46 +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 |
|
chenbowen
|
2052479728
|
1. 临时新增短信平台的单独 topic 消费
|
2025-12-23 19:05:07 +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
|
48660f75cf
|
Merge branch 'dev' into test
|
2025-12-23 17:53:25 +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
|
cda360572e
|
Merge branch 'dev' into test
|
2025-12-23 13:02:04 +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 |
|
chenbowen
|
3349d18103
|
Merge branch 'dev' into test
# Conflicts:
# zt-framework/zt-spring-boot-starter-biz-business/src/main/java/com/zt/plat/framework/business/framework/BusinessDataPermissionEntityScanner.java
|
2025-12-23 11:46:51 +08:00 |
|
chenbowen
|
0ef6ac374b
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-23 11:46:18 +08:00 |
|
chenbowen
|
79452c02f6
|
1. 优化数据权限问题
|
2025-12-23 11:44:37 +08:00 |
|
chenbowen
|
b361a07ce6
|
Merge branch 'dev' into test
|
2025-12-23 10:19:03 +08:00 |
|
chenbowen
|
815c595944
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-23 10:18:39 +08:00 |
|
chenbowen
|
9c0c4cca33
|
1. 升级版本
|
2025-12-23 10:17:15 +08:00 |
|
chenbowen
|
5a2ff28c6f
|
1. 新增 dept 类型的全局上下文权限
|
2025-12-22 19:32:04 +08:00 |
|
chenbowen
|
aaf5c38b05
|
1. 临时排除物流模块的数据权限
|
2025-12-22 17:30:25 +08:00 |
|
chenbowen
|
02208869f0
|
1. 移除二维码默认示例查询方式
|
2025-12-22 14:15:22 +08:00 |
|
chenbowen
|
2a16656b7d
|
Merge branch 'dev' into test
|
2025-12-22 13:47:37 +08:00 |
|
chenbowen
|
2efa78ed74
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-22 13:47:15 +08:00 |
|
chenbowen
|
d688932f6d
|
1. 修复拆出的业务模块无法自动加载数据权限的bug
|
2025-12-22 13:43:56 +08:00 |
|
wencai he
|
f0b1ec7ca3
|
Merge branch 'dev' into 'test'
Dev
See merge request jygk/dsc!12
|
2025-12-22 03:05:45 +00:00 |
|