chenbowen
|
2438eeeb24
|
Merge branch 'dev' into test
|
2025-09-18 21:29:58 +08:00 |
|
chenbowen
|
4bcd599ccc
|
1. 优化用户部门选择部门时的支持接口
2. 完善 e 办同步接口重跑和定时重跑任务
(cherry picked from commit f8c984d627)
|
2025-09-18 21:27:44 +08:00 |
|
chenbowen
|
388bc92802
|
Merge branch 'dev' into test
|
2025-09-18 16:41:27 +08:00 |
|
chenbowen
|
bddd004269
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-09-18 16:41:01 +08:00 |
|
chenbowen
|
79c1d5e6a4
|
1. 新增查询所有本人加下属公司列表接口
|
2025-09-18 16:37:20 +08:00 |
|
chenbowen
|
da8a26a86a
|
Merge branch 'dev' into test
# Conflicts:
# yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java
# yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java
# yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/sync/UserSyncServiceImpl.java
# yudao-module-system/yudao-module-system-server/src/test/java/cn/iocoder/yudao/module/system/service/sync/UserSyncServiceImplTest.java
# yudao-module-template/yudao-module-template-server/src/main/java/cn/iocoder/yudao/module/template/controller/admin/contract/DemoContractController.java
|
2025-09-18 13:59:17 +08:00 |
|
chenbowen
|
a25935f556
|
Merge remote-tracking branch 'base-version/main' into dev
# Conflicts:
# pom.xml
# yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java
# yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java
# yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java
# yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/sync/SyncLogServiceImpl.java
# yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/sync/UserSyncServiceImpl.java
# yudao-module-system/yudao-module-system-server/src/test/java/cn/iocoder/yudao/module/system/service/sync/UserSyncServiceImplTest.java
# yudao-module-template/yudao-module-template-server/src/main/java/cn/iocoder/yudao/module/template/controller/admin/contract/DemoContractController.java
# yudao-server/pom.xml
|
2025-09-18 13:55:08 +08:00 |
|
chenbowen
|
377f5d7494
|
1. 修复代码生成器错误的 mysql 路径
2. 新增部门代码，部门简称字段
|
2025-09-18 13:50:29 +08:00 |
|
chenbowen
|
eb650ef56c
|
1. 同步 base-version
|
2025-09-18 00:52:27 +08:00 |
|
chenbowen
|
76dd62665f
|
1. 同步 base-version
|
2025-09-18 00:51:31 +08:00 |
|
chenbowen
|
c9233e7053
|
1. 去除强制的业务字段 insert 非空校验
2. 修复同步用户错误
3. 同步日志支持接口重跑
4. 新增部门树加载效果优化接口
5. 修复部分 post API 参数注解错误的问题
|
2025-09-17 23:29:43 +08:00 |
|
chenbowen
|
cec34a5333
|
1. 业务附件管理 API 新增带 url 的分页查询方法
2. 区域查询结果新增查询国家信息的接口
(cherry picked from commit e6b063491f)
|
2025-09-17 14:28:44 +08:00 |
|
chenbowen
|
4004d4f691
|
1. 系统新增用户标记为外部用户；e 办同步用户标记为系统用户
2. 业务表新增基础业务字段，创建人与更新人名称
(cherry picked from commit 9ee1100b29)
|
2025-09-17 14:28:44 +08:00 |
|
chenbowen
|
a5bb897551
|
1. 业务附件管理 API 新增带 url 的分页查询方法
2. 区域查询结果新增查询国家信息的接口
(cherry picked from commit e6b063491f)
|
2025-09-17 10:30:56 +08:00 |
|
chenbowen
|
e6b063491f
|
1. 业务附件管理 API 新增带 url 的分页查询方法
2. 区域查询结果新增查询国家信息的接口
|
2025-09-17 10:30:07 +08:00 |
|
chenbowen
|
93b62dc175
|
1. 系统新增用户标记为外部用户；e 办同步用户标记为系统用户
2. 业务表新增基础业务字段，创建人与更新人名称
(cherry picked from commit 9ee1100b29)
|
2025-09-16 20:44:02 +08:00 |
|
chenbowen
|
9ee1100b29
|
1. 系统新增用户标记为外部用户；e 办同步用户标记为系统用户
2. 业务表新增基础业务字段，创建人与更新人名称
|
2025-09-16 16:46:30 +08:00 |
|
chenbowen
|
7619be85ca
|
1. 新增测试环境的登录测试接口
(cherry picked from commit e1a14564d0)
|
2025-09-16 10:24:44 +08:00 |
|
chenbowen
|
aa2ad247c7
|
补全 api 缺失的方法
(cherry picked from commit bea39f9b57)
|
2025-09-16 10:24:41 +08:00 |
|
chenbowen
|
a431151514
|
1. 修复网关配置错误
2. 修复生成器 docker,controller 生成器错误
3. 修复 e 办人员同步错误处理
(cherry picked from commit 45e2562111)
|
2025-09-16 10:24:41 +08:00 |
|
chenbowen
|
b8f9c7016c
|
1. 替换原始 code 签名
2. 服务与模块生成器，支持指定起始端口批量端口分配
(cherry picked from commit e99da38fd4)
|
2025-09-16 10:24:27 +08:00 |
|
chenbowen
|
2af751060e
|
1. 新增在线协同文档功能 v 1
(cherry picked from commit 1ed31a4f49)
|
2025-09-16 10:24:25 +08:00 |
|
chenbowen
|
7dbba42f77
|
1. 调整 e 办 scheme 接口返回
(cherry picked from commit 827ab022ed)
|
2025-09-16 10:24:24 +08:00 |
|
chenbowen
|
7092e696d9
|
1. 调整 e 办 scheme 接口返回
(cherry picked from commit 0215d22c93)
|
2025-09-16 10:24:24 +08:00 |
|
chenbowen
|
d7d99c2f37
|
修复单元测试错误
(cherry picked from commit 481df647b0)
|
2025-09-16 10:24:23 +08:00 |
|
chenbowen
|
26b4721197
|
1. 调整 e 办编辑用户信息时，调整接受的岗位,组织,性别等属性的逻辑
(cherry picked from commit 6304a7a293)
|
2025-09-16 10:24:23 +08:00 |
|
chenbowen
|
f9389a415f
|
1. 调整 e 办相关用户组织同步报文接受逻辑
2. 新增针对 e 办的接口日志记录功能
(cherry picked from commit 28aae25bef)
|
2025-09-16 10:24:22 +08:00 |
|
chenbowen
|
d5ad443a7f
|
1. 修复返回 e 办报文未加密返回的错误
(cherry picked from commit 6081fb21ee)
|
2025-09-16 10:24:21 +08:00 |
|
chenbowen
|
824b3c3ddd
|
1. 修复中铝 e 办同步解密方法错误的bug
(cherry picked from commit e1c59ce4f7)
|
2025-09-16 10:24:20 +08:00 |
|
chenbowen
|
6cf03f1c49
|
1. 统一迁移 nacos 配置到 yaml 主配置，并通过 maven profile 管理
(cherry picked from commit 6aa5116b5b)
|
2025-09-16 10:24:18 +08:00 |
|
chenbowen
|
6e91471a5a
|
1. 解决 e 办密码登录时，没有跳过验证码登录的错误
(cherry picked from commit e034254b89)
|
2025-09-16 10:24:17 +08:00 |
|
chenbowen
|
c04dde88ea
|
1. 中铝e办组织机构人员同步联调接口
2. 设置默认文件预览水印为人员加日期
(cherry picked from commit 07c9ead358)
|
2025-09-16 10:24:15 +08:00 |
|
chenbowen
|
e429da92e8
|
1. 修复单元测试失败的错误
(cherry picked from commit e8ee00c47a)
|
2025-09-16 10:24:14 +08:00 |
|
chenbowen
|
c2fca99039
|
1. 新增测试环境的登录测试接口
(cherry picked from commit e1a14564d0)
|
2025-09-16 09:43:05 +08:00 |
|
chenbowen
|
e1a14564d0
|
1. 新增测试环境的登录测试接口
|
2025-09-16 09:10:48 +08:00 |
|
chenbowen
|
b617b055e5
|
补全 api 缺失的方法
(cherry picked from commit bea39f9b57)
|
2025-09-15 08:47:49 +08:00 |
|
chenbowen
|
bea39f9b57
|
补全 api 缺失的方法
|
2025-09-15 00:31:25 +08:00 |
|
chenbowen
|
85379e6c09
|
1. 修复网关配置错误
2. 修复生成器 docker,controller 生成器错误
3. 修复 e 办人员同步错误处理
(cherry picked from commit 45e2562111)
|
2025-09-11 17:22:36 +08:00 |
|
chenbowen
|
45e2562111
|
1. 修复网关配置错误
2. 修复生成器 docker,controller 生成器错误
3. 修复 e 办人员同步错误处理
|
2025-09-11 17:17:45 +08:00 |
|
chenbowen
|
1e1216c150
|
1. 替换原始 code 签名
2. 服务与模块生成器，支持指定起始端口批量端口分配
(cherry picked from commit e99da38fd4)
|
2025-09-02 10:15:58 +08:00 |
|
chenbowen
|
e99da38fd4
|
1. 替换原始 code 签名
2. 服务与模块生成器，支持指定起始端口批量端口分配
|
2025-09-02 10:15:16 +08:00 |
|
chenbowen
|
3ff84e6f5f
|
1. 新增在线协同文档功能 v 1
(cherry picked from commit 1ed31a4f49)
|
2025-09-01 10:02:03 +08:00 |
|
chenbowen
|
1ed31a4f49
|
1. 新增在线协同文档功能 v 1
|
2025-09-01 10:01:35 +08:00 |
|
chenbowen
|
2cd864f63f
|
1. 调整 e 办 scheme 接口返回
(cherry picked from commit 827ab022ed)
|
2025-08-29 17:12:55 +08:00 |
|
chenbowen
|
827ab022ed
|
1. 调整 e 办 scheme 接口返回
|
2025-08-29 17:12:15 +08:00 |
|
chenbowen
|
1f135db00a
|
1. 调整 e 办 scheme 接口返回
(cherry picked from commit 0215d22c93)
|
2025-08-29 09:21:55 +08:00 |
|
chenbowen
|
0215d22c93
|
1. 调整 e 办 scheme 接口返回
|
2025-08-29 09:21:14 +08:00 |
|
chenbowen
|
689f9acf87
|
修复单元测试错误
(cherry picked from commit 481df647b0)
|
2025-08-28 17:53:41 +08:00 |
|
chenbowen
|
481df647b0
|
修复单元测试错误
|
2025-08-28 17:53:22 +08:00 |
|
chenbowen
|
3ee67053ba
|
1. 调整 e 办编辑用户信息时，调整接受的岗位,组织,性别等属性的逻辑
(cherry picked from commit 6304a7a293)
|
2025-08-28 17:31:40 +08:00 |
|