chenbowen
|
0c0d82f465
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-26 10:43:04 +08:00 |
|
chenbowen
|
12ba2cf756
|
iwork 人员组织同步相关
|
2025-11-26 10:42:24 +08:00 |
|
chenbowen
|
a2f2325119
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-26 01:48:31 +08:00 |
|
chenbowen
|
4c79ac8a6d
|
iwork 人员组织同步相关
|
2025-11-26 01:48:10 +08:00 |
|
chenbowen
|
a263632e49
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-26 01:34:50 +08:00 |
|
chenbowen
|
2e2b7ac6fa
|
iwork 人员组织同步相关
|
2025-11-26 01:34:08 +08:00 |
|
chenbowen
|
299132943c
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-26 01:05:55 +08:00 |
|
chenbowen
|
76ba994b50
|
iwork 人员组织同步相关
|
2025-11-26 01:04:35 +08:00 |
|
chenbowen
|
685ed6b504
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-25 23:27:01 +08:00 |
|
chenbowen
|
f754b1c694
|
iwork 人员组织同步相关
|
2025-11-25 23:26:26 +08:00 |
|
chenbowen
|
dc1db47d07
|
iwork 人员组织同步相关
|
2025-11-25 20:31:56 +08:00 |
|
chenbowen
|
02e0c81446
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-25 20:09:06 +08:00 |
|
chenbowen
|
6c8c479984
|
同步 nacos 配置到基础系统
|
2025-11-25 20:08:31 +08:00 |
|
hewencai
|
518aa2a773
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-11-25 19:09:13 +08:00 |
|
hewencai
|
4003388740
|
feat:集成移动云mas短信平台
|
2025-11-25 19:08:55 +08:00 |
|
chenbowen
|
8689c5e844
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-25 17:42:26 +08:00 |
|
chenbowen
|
5be1b75be8
|
iwork 人员组织同步相关，兼容 iwork 返回
|
2025-11-25 17:41:39 +08:00 |
|
chenbowen
|
547b1d9afb
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-25 17:22:36 +08:00 |
|
chenbowen
|
2f9c28f166
|
iwork 人员组织同步相关，兼容 iwork 返回
|
2025-11-25 17:22:11 +08:00 |
|
chenbowen
|
c24ae5bad8
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-25 17:18:43 +08:00 |
|
chenbowen
|
64eb031486
|
iwork 人员组织同步相关，兼容 iwork 返回
|
2025-11-25 17:18:04 +08:00 |
|
chenbowen
|
95fab27556
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-25 16:49:43 +08:00 |
|
chenbowen
|
2efb815d59
|
iwork 人员组织同步相关，兼容 iwork 返回
|
2025-11-25 16:41:29 +08:00 |
|
chenbowen
|
77b4e62def
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-25 16:06:41 +08:00 |
|
chenbowen
|
e2dbaf12a4
|
iwork 人员组织同步相关
|
2025-11-25 16:05:52 +08:00 |
|
chenbowen
|
e0d5c0221e
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-25 15:55:13 +08:00 |
|
chenbowen
|
d4d80ce86a
|
iwork 人员组织同步相关
|
2025-11-25 15:48:47 +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 |
|
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
|
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 |
|
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
|
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 |
|
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 |
|
chenbowen
|
53a0293b7c
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-13 21:40:08 +08:00 |
|
chenbowen
|
2280d29fb6
|
调整后台返回部门id与公司id类型为 string
|
2025-11-13 21:16:08 +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 |
|
hewencai
|
f02745454d
|
修改门户管理图片显示逻辑
|
2025-11-13 17:32:30 +08:00 |
|
hewencai
|
e00086c6e8
|
feat:新增门户管理功能
|
2025-11-13 10:28:19 +08:00 |
|
chenbowen
|
c399bdf720
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-12 22:25:46 +08:00 |
|
chenbowen
|
1a34cbc678
|
1. 验证码接口 url 不校验租户
|
2025-11-12 22:23:58 +08:00 |
|
chenbowen
|
a9efa1d84a
|
1. 新增业务系统日志收集
|
2025-11-06 00:49:53 +08:00 |
|
chenbowen
|
f64b76e703
|
1. 新增业务系统日志收集
|
2025-11-06 00:41:57 +08:00 |
|
chenbowen
|
2a0e0da08a
|
1. 新增业务系统日志收集
|
2025-11-06 00:37:48 +08:00 |
|
chenbowen
|
00297f65b4
|
1. 新增业务系统日志收集
|
2025-11-06 00:28:14 +08:00 |
|
chenbowen
|
e98615c896
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-05 16:32:45 +08:00 |
|