chenbowen
|
f8d95218f5
|
Merge branch 'dev' into test
|
2025-11-25 15:55:44 +08:00 |
|
chenbowen
|
e0d5c0221e
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-25 15:55:13 +08:00 |
|
chenbowen
|
59afa893b0
|
修复编译错误
|
2025-11-25 15:54:50 +08:00 |
|
chenbowen
|
d4d80ce86a
|
iwork 人员组织同步相关
|
2025-11-25 15:48:47 +08:00 |
|
chenbowen
|
70868a77c0
|
Merge branch 'dev' into test
|
2025-11-25 09:15:54 +08:00 |
|
chenbowen
|
eab968da72
|
Merge remote-tracking branch 'base-version/main' into dev
# Conflicts:
# pom.xml
|
2025-11-25 09:15:32 +08:00 |
|
chenbowen
|
e212ba4d2f
|
升级版本
|
2025-11-25 09:14:36 +08:00 |
|
chenbowen
|
4ddd38c3b6
|
1. 升级 3.0.45
|
2025-11-24 19:45:47 +08:00 |
|
chenbowen
|
54f763c15e
|
Merge branch 'dev' into test
|
2025-11-24 19:35:37 +08:00 |
|
chenbowen
|
65f62fddd6
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-24 19:19:09 +08:00 |
|
chenbowen
|
65b99740c1
|
新增 long 集合类型的 string 转换
|
2025-11-24 19:18:23 +08:00 |
|
chenbowen
|
f7ee073617
|
Merge branch 'dev' into test
|
2025-11-24 15:54:06 +08:00 |
|
chenbowen
|
4b17c1d833
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-24 15:53:49 +08:00 |
|
chenbowen
|
77c46acf9e
|
1. 修改请求 iwork 的传参方式
|
2025-11-24 15:51:45 +08:00 |
|
qianshijiang
|
3d3808be48
|
编译报错修改。
|
2025-11-24 09:52:28 +08:00 |
|
qianshijiang
|
6b266e3211
|
编译报错修改。
|
2025-11-24 09:49:44 +08:00 |
|
chenbowen
|
491f8c8b1f
|
Merge branch 'dev' into test
|
2025-11-21 18:30:32 +08:00 |
|
chenbowen
|
e57f649e72
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-21 18:30:15 +08:00 |
|
chenbowen
|
ce39dc6d4b
|
1. iwork 二次适配
|
2025-11-21 18:20:11 +08:00 |
|
chenbowen
|
8dd7ccaf5f
|
Merge branch 'dev' into test
|
2025-11-21 17:25:09 +08:00 |
|
chenbowen
|
14c81350bd
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-21 17:24:41 +08:00 |
|
chenbowen
|
7e3baeba46
|
修复 nacos 刷新配置后，ignoreurl 失效的bug
|
2025-11-21 17:23:36 +08:00 |
|
chenbowen
|
4106cfced2
|
Merge branch 'dev' into test
# Conflicts:
# zt-dependencies/pom.xml
|
2025-11-20 18:36:13 +08:00 |
|
chenbowen
|
985b429f6f
|
Merge remote-tracking branch 'base-version/main' into dev
# Conflicts:
# zt-dependencies/pom.xml
|
2025-11-20 18:35:03 +08:00 |
|
chenbowen
|
0b646295da
|
1. 新增 iwork 同步用户组织信息接口
2. 修复错误设置版本信息在 zt-dependencies 的 bug
|
2025-11-20 18:27:01 +08:00 |
|
qianshijiang
|
5374b0567b
|
封装树形数据操作工具类
|
2025-11-20 15:09:08 +08:00 |
|
qianshijiang
|
47f710648b
|
新增业务附件查询权限标识
|
2025-11-20 10:25:57 +08:00 |
|
chenbowen
|
4c9b1c616e
|
Merge branch 'dev' into test
|
2025-11-18 19:03:09 +08:00 |
|
chenbowen
|
88fb1652e6
|
Merge remote-tracking branch 'base-version/main' into dev
# Conflicts:
# zt-dependencies/pom.xml
# zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/sso/ExternalSsoServiceImpl.java
|
2025-11-18 18:51:57 +08:00 |
|
chenbowen
|
52a0b561f9
|
1. 新增针对外部的自定义 sso 菜单外链
|
2025-11-18 18:47:50 +08:00 |
|
chenbowen
|
74d2a1a236
|
1. 升级 3.0.44
|
2025-11-18 14:13:47 +08:00 |
|
chenbowen
|
585dd3449f
|
Merge branch 'dev' into test
|
2025-11-18 11:39:28 +08:00 |
|
chenbowen
|
8dc3e81d4f
|
1. 升级 3.0.44
|
2025-11-18 11:39:01 +08:00 |
|
chenbowen
|
6b3453e4ee
|
Merge branch 'dev' into test
|
2025-11-18 10:59:55 +08:00 |
|
chenbowen
|
633e430f46
|
1. 新增分页接口聚合查询注解支持
2. 优化 databus api 日志记录的字段缺失问题
3. 新增 eplat sso 页面登录校验
4. 用户、部门编辑新增 seata 事务支持
5. 新增 iwork 流程发起接口
6. 新增 eban 同步用户时的岗位处理逻辑
7. 新增无 skywalking 时的 traceId 支持
|
2025-11-18 10:59:29 +08:00 |
|
qianshijiang
|
8b3d93dc17
|
新增业务附件查询权限标识
|
2025-11-18 10:57:42 +08:00 |
|
chenbowen
|
266eb45e00
|
1. 新增分页接口聚合查询注解支持
2. 优化 databus api 日志记录的字段缺失问题
3. 新增 eplat sso 页面登录校验
4. 用户、部门编辑新增 seata 事务支持
5. 新增 iwork 流程发起接口
6. 新增 eban 同步用户时的岗位处理逻辑
7. 新增无 skywalking 时的 traceId 支持
|
2025-11-18 10:03:34 +08:00 |
|
qianshijiang
|
c4482af144
|
新增业务附件查询权限标识
|
2025-11-17 18:01:00 +08:00 |
|
chenbowen
|
d5a1e5c157
|
Merge branch 'dev' into test
|
2025-11-13 21:41:13 +08:00 |
|
chenbowen
|
53a0293b7c
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-13 21:40:08 +08:00 |
|
chenbowen
|
af7f103a38
|
调整后台返回部门id与公司id类型为 string
|
2025-11-13 21:39:27 +08:00 |
|
chenbowen
|
2280d29fb6
|
调整后台返回部门id与公司id类型为 string
|
2025-11-13 21:16:08 +08:00 |
|
chenbowen
|
71e63519ae
|
调整后台返回部门id与公司id类型为 string
|
2025-11-13 21:10:38 +08:00 |
|
chenbowen
|
c8dca75943
|
Merge branch 'dev' into test
|
2025-11-13 18:45:33 +08:00 |
|
chenbowen
|
2eb09ff35d
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-13 18:45:11 +08:00 |
|
chenbowen
|
c1f12dfe5e
|
1. 修复 userinfo 过多导致的用户登录失败错误
|
2025-11-13 18:44:28 +08:00 |
|
wencai he
|
428c9a60b1
|
Merge branch 'dev' into 'test'
Dev
See merge request jygk/dsc!3
|
2025-11-13 09:44:31 +00:00 |
|
hewencai
|
4efa894c8f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-11-13 17:32:31 +08:00 |
|
hewencai
|
f02745454d
|
修改门户管理图片显示逻辑
|
2025-11-13 17:32:30 +08:00 |
|
qianshijiang
|
d9fa921fda
|
添加异步任务工具类
|
2025-11-13 14:59:11 +08:00 |
|