 lishiwei
|
b9d8f32efa
|
Merge branch 'dev_update_pd' into dev
|
2026-07-30 09:27:30 +08:00 |
|
lishiwei
|
093e8f39ef
|
refactor(): 优化用户密码更新逻辑
|
2026-07-30 09:26:45 +08:00 |
 zhangxiongfeng
|
4e3ee4e7ac
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-07-29 17:15:20 +08:00 |
|
zhangxiongfeng
|
604d96b3fa
|
大华口门对接
|
2026-07-29 17:15:00 +08:00 |
|
zhangxiongfeng
|
9c78c946bc
|
删除 start/src/main/resources/application.yml
|
2026-07-29 17:12:09 +08:00 |
|
zhangxiongfeng
|
aee2515e20
|
删除 start/src/main/java/com/zcloud/basic/info/config/LocalDevFilterConfig.java
|
2026-07-29 17:11:41 +08:00 |
|
lishiwei
|
15ffa41a95
|
chore(): 添加默认密码修改提醒注释
|
2026-07-29 11:47:09 +08:00 |
|
zhangxiongfeng
|
ac94e9fe88
|
大华口门对接
|
2026-07-28 18:25:57 +08:00 |
 zhaokai
|
f670036b18
|
config(bootstrap): 切换到生产环境配置文件
|
2026-07-28 18:16:54 +08:00 |
|
zhaokai
|
ba47d2324f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-07-28 18:07:06 +08:00 |
|
zhaokai
|
1ce6637c07
|
Merge branch 'dev_visual_page' into dev
|
2026-07-28 18:06:53 +08:00 |
|
zhangxiongfeng
|
bcb9d32b95
|
大华口门对接
|
2026-07-28 16:58:06 +08:00 |
|
zhangxiongfeng
|
9bb96f109d
|
Merge branch 'dev' of http://47.92.113.182:3000/zcloud_gbs/zcloud_gbs_basic_info_gwj into komen
|
2026-07-28 15:29:24 +08:00 |
|
zhangxiongfeng
|
8beed9d73d
|
大华口门对接
|
2026-07-28 15:29:07 +08:00 |
|
lishiwei
|
3b940c0619
|
feat: 优化修改密码逻辑
|
2026-07-28 14:29:20 +08:00 |
|
zhaokai
|
0feb06ba0d
|
feat(CorpInfoController): 添加查询当前登录租户企业详情接口
|
2026-07-28 11:20:52 +08:00 |
|
zhaokai
|
ef0dddf572
|
Merge branch 'dev_visual_page' into dev
|
2026-07-28 11:20:06 +08:00 |
|
zhaokai
|
88f58d580f
|
feat(CorpInfoController): 添加查询当前登录租户企业详情接口
|
2026-07-28 11:19:46 +08:00 |
|
zhangxiongfeng
|
65ad2b538e
|
大华口门对接
|
2026-07-28 10:33:46 +08:00 |
|
zhangxiongfeng
|
2cc429996f
|
Merge remote-tracking branch 'origin/dev' into komen
|
2026-07-28 08:43:16 +08:00 |
|
zhaokai
|
a6c3aab30c
|
Merge branch 'dev_visual_page' into dev
|
2026-07-27 15:13:27 +08:00 |
|
zhaokai
|
c4da5decd4
|
feat(corp): 添加港区信息字段并优化用户统计查询
|
2026-07-24 15:07:57 +08:00 |
|
zhaokai
|
816d82f23e
|
feat(img-files): 添加图片文件删除接口
- 新增 getDelete 接口用于删除单个图片文件
- 新增 getIds 接口用于批量删除图片文件
(cherry picked from commit 8ff5a19654)
|
2026-07-22 09:06:17 +08:00 |
|
zhaokai
|
8ff5a19654
|
feat(img-files): 添加图片文件删除接口
- 新增 getDelete 接口用于删除单个图片文件
- 新增 getIds 接口用于批量删除图片文件
|
2026-07-22 08:40:45 +08:00 |
|
zhaokai
|
2467f7327e
|
fix(user): 修复九公司标识设置逻辑
- 移除九公司配置ID验证逻辑
- 直接将九公司标识设置为true
|
2026-07-21 13:33:59 +08:00 |
|
zhaokai
|
35c9818f2c
|
feat(corp): 为可视化大屏新增企业列表接口
|
2026-07-21 08:54:53 +08:00 |
|
zhaokai
|
d868f64395
|
feat(corp): 为可视化大屏企业用户汇总接口添加查询参数支持
|
2026-07-20 14:54:54 +08:00 |
|
zhaokai
|
8f7f5201ea
|
feat(corp): 为可视化大屏企业用户汇总接口添加查询参数支持
|
2026-07-20 14:10:13 +08:00 |
|
zhaokai
|
1eb129d61d
|
feat(config): 修改九公司配置支持多公司ID
|
2026-07-20 12:18:01 +08:00 |
|
zhaokai
|
81d080562c
|
Merge branch 'dev_visual_page' into dev
|
2026-07-17 15:28:42 +08:00 |
|
zhaokai
|
2aa7777dfc
|
feat(corp): 添加可视化大屏-企业用户汇总统计功能
|
2026-07-17 15:28:02 +08:00 |
|
zhaokai
|
a330e54182
|
config(start): 切换生产环境配置文件
|
2026-07-17 15:20:16 +08:00 |
|
zhaokai
|
176011e6f4
|
Merge branch 'dev_visual_page' into dev
# Conflicts:
# web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java
# web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java
# web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java
# web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java
|
2026-07-17 14:52:37 +08:00 |
|
zhaokai
|
fdd5bc8605
|
feat(corp): 添加可视化大屏-企业部门用户统计数据接口
|
2026-07-17 14:49:55 +08:00 |
|
zhaokai
|
2cd65662fc
|
config(start): 切换到新的生产环境配置文件
|
2026-07-14 17:20:28 +08:00 |
|
zhaokai
|
0826d453c9
|
chore(build): 删除 JavaScript 许可证文件中的版权信息
|
2026-07-14 16:01:44 +08:00 |
|
zhaokai
|
5dd3e1b7da
|
feat(user): 更新用户信息时同步用户状态标识
- 优化部门名称更新逻辑确保信息一致性
- 添加员工状态变更标志更新方法
- 重构用户更新命令参数处理逻辑
|
2026-07-14 16:00:32 +08:00 |
|
zhaokai
|
04285b4a52
|
feat(user): 添加九公司用户标识功能
(cherry picked from commit 1e0b189115)
|
2026-07-14 09:54:25 +08:00 |
|
zhaokai
|
cf36acaea9
|
feat(user): 添加九公司用户标识功能
(cherry picked from commit ba4945e651)
|
2026-07-14 09:54:20 +08:00 |
|
zhaokai
|
1e0b189115
|
feat(user): 添加九公司用户标识功能
|
2026-07-14 09:16:15 +08:00 |
|
zhaokai
|
ba4945e651
|
feat(user): 添加九公司用户标识功能
|
2026-07-13 13:54:29 +08:00 |
|
zhaokai
|
c631087511
|
chore(build): 人资对接调整，未测试
|
2026-07-13 10:43:15 +08:00 |
|
zhaokai
|
4e66d236d9
|
chore(build): 修改日志
|
2026-07-09 16:16:54 +08:00 |
|
zhaokai
|
97d6d2f1fe
|
chore(build): 导入用户添加身份证和人员类型
|
2026-07-09 15:32:29 +08:00 |
|
zhaokai
|
33e3598981
|
fix(user): 修复用户离职处理中的角色设置和删除操作
|
2026-06-30 17:50:36 +08:00 |
|
zhaokai
|
627f41e68e
|
fix(config): 修复配置文件加载和用户查询参数映射问题
(cherry picked from commit 9673af71a3)
|
2026-06-29 14:23:25 +08:00 |
|
zhaokai
|
9673af71a3
|
fix(config): 修复配置文件加载和用户查询参数映射问题
|
2026-06-29 13:57:59 +08:00 |
|
zhaokai
|
bb30e51267
|
refactor(config): 更新配置文件
|
2026-06-25 15:50:07 +08:00 |
|
zhaokai
|
22c51a089e
|
refactor(config): 更新配置文件和用户门面实现
(cherry picked from commit 0c8e1cf6e4)
# Conflicts:
# web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java
|
2026-06-25 15:49:29 +08:00 |
|
zhaokai
|
0c8e1cf6e4
|
refactor(config): 更新配置文件和用户门面实现
|
2026-06-25 15:48:07 +08:00 |