zhangyue
|
ae0f84b10d
|
gbs底座数据互通
|
2025-11-18 09:04:37 +08:00 |
 SondonYong
|
c14eb8e8a0
|
dev:代码规范修改
|
2025-11-17 15:00:11 +08:00 |
 zhaokai
|
56622a7e55
|
去掉redis
|
2025-11-14 13:32:06 +08:00 |
|
SondonYong
|
b01cec1375
|
dev:导出用户修改
|
2025-11-13 10:56:39 +08:00 |
|
SondonYong
|
3cb753d138
|
Merge remote-tracking branch 'origin/main' into main
# Conflicts:
# web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoPageQry.java
# web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/DepartmentRepository.java
# web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java
# web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java
# web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
|
2025-11-10 18:20:40 +08:00 |
|
SondonYong
|
af9b0f4b52
|
dev:人员导入
|
2025-11-10 18:19:27 +08:00 |
|
zhaokai
|
c0e02f7aa7
|
企业逻辑调整
|
2025-11-10 17:10:19 +08:00 |
|
zhaokai
|
9b5e148211
|
部门增加管理角色，企业逻辑调整
|
2025-11-10 16:33:11 +08:00 |
|
SondonYong
|
b0fdf323b3
|
dev:人员导入(未完成)
|
2025-11-10 16:21:06 +08:00 |
|
SondonYong
|
8ea23c9a59
|
Merge remote-tracking branch 'origin/main' into main
|
2025-11-10 16:19:44 +08:00 |
|
SondonYong
|
22bb8b4929
|
dev:特种/安全证书修改(未完成)
|
2025-11-10 16:19:31 +08:00 |
|
zhangyue
|
00d9e941a7
|
新增获取当前登录用户信息接口
|
2025-11-10 16:17:47 +08:00 |
|
SondonYong
|
53cec84911
|
dev:岗位管理代码规范
|
2025-11-10 16:02:05 +08:00 |
|
SondonYong
|
bb0bec3639
|
dev:岗位管理去掉关联部门数据权限
|
2025-11-10 14:07:01 +08:00 |
|
SondonYong
|
98b57d9eba
|
dev:特种作业人员管理,安全人员信息管理,人员信息导出接口
|
2025-11-08 17:22:06 +08:00 |
|
zhangyue
|
d92375cbe6
|
删除错误代码
|
2025-11-08 11:17:29 +08:00 |
|
zhangyue
|
0e5bf12b9b
|
完善用户履职记录功能
|
2025-11-08 10:58:30 +08:00 |
|
zhaokai
|
0489ce49dd
|
企业调整
|
2025-11-07 18:33:09 +08:00 |
|
zhaokai
|
16e69a803b
|
企业资质调整
|
2025-11-07 16:27:37 +08:00 |
|
SondonYong
|
dfa3a549f6
|
Merge remote-tracking branch 'origin/main' into main
|
2025-11-07 16:22:06 +08:00 |
|
SondonYong
|
b329c67de6
|
dev:人员资格证书管理v1.0
|
2025-11-07 16:22:00 +08:00 |
 dearLin
|
9c7b45c8c8
|
feat:完善获取岗位信息
|
2025-11-07 16:03:11 +08:00 |
|
zhaokai
|
caf1911134
|
调整新增时业务主键为空时，添加默认32位uuid
|
2025-11-07 14:46:03 +08:00 |
|
SondonYong
|
5fdfd00513
|
Merge remote-tracking branch 'origin/main' into main
|
2025-11-07 13:50:29 +08:00 |
|
zhaokai
|
cd23dcec04
|
部门删除同步gbs,调整部门树
|
2025-11-07 11:21:32 +08:00 |
|
SondonYong
|
1d88f7444a
|
Merge remote-tracking branch 'origin/main' into main
|
2025-11-07 11:07:17 +08:00 |
|
dearLin
|
ec219b6222
|
feat:底座接口使用1.7.0高版本
|
2025-11-07 11:04:36 +08:00 |
huangyuxuan
|
2d957fca4c
|
Merge remote-tracking branch 'origin/main'
|
2025-11-07 11:04:07 +08:00 |
|
huangyuxuan
|
16b5bff83f
|
[新增功能](main)
- 去掉shiro
|
2025-11-07 11:03:46 +08:00 |
|
SondonYong
|
b9a40df3ac
|
dev:岗位管理-代码优化
|
2025-11-07 09:29:49 +08:00 |
|
zhangyue
|
0a306f0e57
|
用户字段修改
增加用户履职日志
|
2025-11-07 09:24:27 +08:00 |
|
zhangyue
|
86c3b18e13
|
用户管理相关功能
|
2025-11-06 18:31:00 +08:00 |
|
dearLin
|
91b4b995d9
|
feat:用户部分代码完善获取人、部门、岗位、企业数据
|
2025-11-06 18:10:14 +08:00 |
|
dearLin
|
eb909fed2a
|
feat:用户部分代码完善获取人、部门、岗位、企业数据
|
2025-11-06 17:17:34 +08:00 |
|
SondonYong
|
0be93af579
|
dev:岗位管理-接口联调
|
2025-11-06 16:25:58 +08:00 |
|
SondonYong
|
f83f8cb323
|
Merge remote-tracking branch 'origin/main' into main
# Conflicts:
# web-app/src/main/java/com/zcloud/basic/info/command/PostUpdateExe.java
|
2025-11-06 16:11:52 +08:00 |
|
SondonYong
|
9093b3f3a7
|
dev:岗位管理-接口联调
|
2025-11-06 16:10:13 +08:00 |
|
zhaokai
|
396c045704
|
增加企业用户中台首页接口，企业，部门，岗位，用户，修改和删除时，删除对应redis信息
|
2025-11-06 15:50:51 +08:00 |
|
zhaokai
|
c2caa62360
|
修改部门接口和企业新增接口调整企业类型查询
|
2025-11-06 11:04:51 +08:00 |
|
zhangyue
|
ade0f82cb5
|
用户管理功能
|
2025-11-06 10:12:59 +08:00 |
|
zhaokai
|
e43128d16f
|
修改部门树接口
|
2025-11-05 18:01:45 +08:00 |
|
zhaokai
|
aea60a4e65
|
修改企业和部门接口
|
2025-11-05 17:55:20 +08:00 |
|
SondonYong
|
b22abc889e
|
dev:岗位管理-修改接口逻辑优化
|
2025-11-05 17:34:19 +08:00 |
|
huangyuxuan
|
661c37a0c7
|
Merge remote-tracking branch 'origin/main'
|
2025-11-05 16:46:58 +08:00 |
|
huangyuxuan
|
9ba4a5ffde
|
[问题修复](main)
- 企业管理联调
|
2025-11-05 16:46:46 +08:00 |
|
SondonYong
|
dfda3c995f
|
dev:岗位管理-代码修改
|
2025-11-05 16:42:45 +08:00 |
|
SondonYong
|
cd583ba3c8
|
Merge remote-tracking branch 'origin/main' into main
|
2025-11-05 13:46:12 +08:00 |
|
zhaokai
|
fd11ffe72e
|
修改增加企业和部门接口
|
2025-11-05 11:35:58 +08:00 |
|
SondonYong
|
da84291f31
|
dev:岗位管理-代码修改
|
2025-11-05 10:25:56 +08:00 |
|
SondonYong
|
d7e75502ea
|
dev:岗位管理-删除校验文案修改
|
2025-11-04 18:05:17 +08:00 |