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 |
|
hewencai
|
0bdded447a
|
update：调整数据同步用户-部门，用户-岗位同步顺序
|
2025-12-22 11:03:15 +08:00 |
|
hewencai
|
cea886c9b2
|
update：调整数据同步用户-部门，用户-岗位同步顺序
|
2025-12-22 09:51:05 +08:00 |
|
chenbowen
|
bdd22ed132
|
1. 去除部门编码为空时，默认使用 id 作为 code 进行映射的逻辑
|
2025-12-18 22:26:05 +08:00 |
|
chenbowen
|
494de02d65
|
1. 修复父子部门跨页场景下，无法正确生成层级代码的bug
|
2025-12-18 21:39:49 +08:00 |
|
chenbowen
|
a86b98b0f5
|
1. 新增 permissionApi 查询当前用户权限级别的方法
|
2025-12-18 20:26:27 +08:00 |
|
chenbowen
|
633772f8b1
|
1. 修正初始化 sql 简化内容
|
2025-12-18 14:46:12 +08:00 |
|
chenbowen
|
e5d9036dfa
|
Merge branch 'dev' into test
|
2025-12-18 14:22:23 +08:00 |
|
chenbowen
|
6dd44ea02d
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-18 14:21:38 +08:00 |
|
chenbowen
|
1fa7416905
|
1. 统一 iwork 的同步组织代码生成逻辑
|
2025-12-18 14:18:56 +08:00 |
|
chenbowen
|
b96d40b8d1
|
Merge branch 'dev' into test
|
2025-12-18 13:21:54 +08:00 |
|
chenbowen
|
c86a765b73
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-18 13:21:03 +08:00 |
|
chenbowen
|
870c6a5f88
|
1. 统一 iwork 的同步组织代码生成逻辑
|
2025-12-18 13:19:39 +08:00 |
|
chenbowen
|
660e0cf401
|
Merge branch 'dev' into test
|
2025-12-17 20:18:58 +08:00 |
|
chenbowen
|
9bc519aa0d
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-17 20:18:42 +08:00 |
|
chenbowen
|
4082e61874
|
1. 调整初始化脚本
|
2025-12-17 20:18:13 +08:00 |
|
chenbowen
|
f40ae1aa74
|
Merge branch 'dev' into test
|
2025-12-17 15:10:44 +08:00 |
|
chenbowen
|
878dfde572
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-17 15:10:28 +08:00 |
|
chenbowen
|
1303ac250e
|
1. 使用 id 进行同步，避免 username 修改后提示重复的 bug
|
2025-12-17 15:10:06 +08:00 |
|
chenbowen
|
bfee58e0d7
|
Merge branch 'dev' into test
|
2025-12-17 14:40:15 +08:00 |
|
chenbowen
|
a4924bd718
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-17 14:40:00 +08:00 |
|
chenbowen
|
d81413e239
|
1. 修复 databus 在多层嵌套的 json 报文，签名存在异常的 bug
|
2025-12-17 14:39:23 +08:00 |
|
wencai he
|
e6a0eef084
|
Merge branch 'dev' into 'test'
Dev
See merge request jygk/dsc!11
|
2025-12-17 03:32:22 +00:00 |
|
hewencai
|
0b8e200aa1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-12-17 11:32:12 +08:00 |
|
hewencai
|
738c82b000
|
update：调整数据同步生产topic生成器
|
2025-12-17 11:31:57 +08:00 |
|
chenbowen
|
ccdf3d28ff
|
1. 固定 databus 服务在 64 ip 配合网络测试
|
2025-12-17 09:42:16 +08:00 |
|
chenbowen
|
498e0b864a
|
Merge branch 'dev' into test
|
2025-12-16 21:36:52 +08:00 |
|
chenbowen
|
2d5b71896e
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-16 21:36:36 +08:00 |
|
chenbowen
|
12157d5dcb
|
1. 修复 databus 在多层嵌套的 json 报文，签名存在异常的 bug
|
2025-12-16 21:35:08 +08:00 |
|
hewencai
|
7e25d6d106
|
fix：修复数据同步配置校验缺失问题
(cherry picked from commit 13403ea027)
|
2025-12-16 18:43:38 +08:00 |
|