Commit Graph

231 Commits

Author SHA1 Message Date
zhanghonghao
028c067bcc feat(REQ-3488): 提交企业相关的查询接口实现 2024-12-26 17:02:43 +08:00
zhanghonghao
451de83afc Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3282' into feature/REQ-3488-zhh
# Conflicts:
#	orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/service/impl/QualificationServiceImpl.java
2024-12-26 15:18:16 +08:00
zhanghonghao
4132e694bf feat(REQ-3282): 调整包名 2024-12-26 15:16:16 +08:00
zhanghonghao
58f4af2788 feat(REQ-3488): 实现maokai等接口 2024-12-26 15:15:15 +08:00
zhanghonghao
a587f23b3c Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3282' into feature/REQ-3488-zhh 2024-12-26 13:34:01 +08:00
zhanghonghao
eae694a613 feat(REQ-3282): 调整单位的req/resp的路径 2024-12-26 11:36:06 +08:00
zhanghonghao
16c7f0d77c feat(REQ-3448): 增加资质的实现 2024-12-26 11:29:34 +08:00
zhanghonghao
d297589892 Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3282' into feature/REQ-3282-v2-zhh 2024-12-26 10:39:59 +08:00
liuyang
54c88183d3 feat:[REQ-3282] 将通用能力放在foundation层中 2024-12-26 10:30:33 +08:00
liuyang
8e95bafe08 Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-26 10:11:20 +08:00
liuyang
013954f7da feat:[REQ-3282] 删除无用依赖 2024-12-26 10:11:15 +08:00
周敏
6a7a78027a feat(REQ-3282): 修复job查询问题 2024-12-26 10:04:09 +08:00
宋远伦
b9d296f004 Merge branch 'feature/REQ-3282-syl' into 'feature/REQ-3282'
Feature/req 3282 syl

See merge request universal/infrastructure/backend/orgmanax!41
2024-12-25 14:00:00 +00:00
songyuanlun
94caf009f3 feat(REQ-3282): 岗位分组和关联关系查询新增includeDeleted 2024-12-25 21:58:43 +08:00
songyuanlun
7faac00411 feat(REQ-3282): 岗位接口参数支持查询身份id和岗位名模糊条件 2024-12-25 21:44:31 +08:00
liuyang
abf4d345f0 Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-25 17:13:51 +08:00
liuyang
050642ac35 feat:[REQ-3282] 协同关系增加默认值查询 2024-12-25 17:13:47 +08:00
周敏
cc8e5ed212 feat(REQ-3282): 提供briefDTO,用于聚合 step2 2024-12-25 17:04:46 +08:00
liuyang
864e8426e4 Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-25 16:46:55 +08:00
liuyang
2a07843626 feat:[REQ-3282] 增加协同关系类型查询 2024-12-25 16:46:50 +08:00
周敏
3d4788d670 feat(REQ-3282): 提供briefDTO,用于聚合 2024-12-25 15:28:36 +08:00
张弘昊
2965d1c0b2 Merge branch 'feature/REQ-3282-zhh' into 'feature/REQ-3282'
feat(REQ-3282): unitList查询增加includeDeleted

See merge request universal/infrastructure/backend/orgmanax!39
2024-12-25 07:21:02 +00:00
zhanghonghao
21d3498c0b feat(REQ-3282): unitList查询增加includeDeleted 2024-12-25 15:19:09 +08:00
张弘昊
2704bfe4ef Merge branch 'feature/REQ-3282-zhh' into 'feature/REQ-3282'
Feature/req 3282 zhh

See merge request universal/infrastructure/backend/orgmanax!37
2024-12-25 07:15:10 +00:00
zhanghonghao
821d7ab143 feat(REQ-3282): unitList查询增加includeDeleted 2024-12-25 15:13:34 +08:00
liuyang
d02a5b2a26 Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-25 14:37:23 +08:00
liuyang
751351cc17 feat:[REQ-3282] 修改启动问题 2024-12-25 14:37:17 +08:00
zhanghongbo
956c0ce56c Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-25 14:35:12 +08:00
zhanghongbo
31aa1b00a7 feat(REQ-3282): 新增节点用户代码 2024-12-25 14:35:06 +08:00
zhanghonghao
10f9e58ea0 Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3282' into feature/REQ-3282-v2-zhh 2024-12-25 14:26:29 +08:00
liuyang
a77ee4de8a Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-25 14:18:17 +08:00
liuyang
7a41b82e61 feat:[REQ-3282] 自测, 修复已知问题 2024-12-25 14:18:13 +08:00
周敏
1a29267804 feat(REQ-3282): NodeUser加密字段处理 2024-12-25 14:01:21 +08:00
liuyang
fd93f73c58 Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-25 11:43:40 +08:00
liuyang
985229f627 feat:[REQ-3282] 自测, 修复已知问题 2024-12-25 11:43:35 +08:00
宋远伦
bcee7ab18f Merge branch 'feature/REQ-3282-syl' into 'feature/REQ-3282'
feat(REQ-3282): 岗位接口调试

See merge request universal/infrastructure/backend/orgmanax!36
2024-12-25 03:22:02 +00:00
songyuanlun
d01523e0f6 feat(REQ-3282): 岗位接口调试 2024-12-25 11:14:42 +08:00
liuyang
564e799141 Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-25 11:12:54 +08:00
liuyang
bb8d798510 feat:[REQ-3282] 自测, 修复已知问题 2024-12-25 11:12:50 +08:00
zhanghonghao
6235280b9d feat(REQ-3282): 添加qualificationsApply 2024-12-25 11:08:39 +08:00
zhanghongbo
b393b75ae2 Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-25 11:01:48 +08:00
zhanghongbo
3dcc645de7 feat(REQ-3282): 解决arthas启动问题 2024-12-25 11:01:37 +08:00
liuyang
ed90487f85 Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-25 10:34:24 +08:00
liuyang
dff44ba17d feat:[REQ-3282] 删除内部类,使用实体类进行传递数据 2024-12-25 10:34:19 +08:00
宋远伦
cf6eadece6 Merge branch 'feature/REQ-3282-syl' into 'feature/REQ-3282'
feat(REQ-3282): 岗位扩展字段优化

See merge request universal/infrastructure/backend/orgmanax!34
2024-12-24 10:41:05 +00:00
songyuanlun
fca5b84da4 feat(REQ-3282): 岗位扩展字段优化 2024-12-24 18:38:45 +08:00
zhanghonghao
8501568b39 feat(REQ-3282): 添加创建时间和更新时间 2024-12-24 17:47:53 +08:00
liuyang
5ed580c89e feat:[REQ-3282] 增加异常处理类 2024-12-24 17:47:25 +08:00
liuyang
59cd1feb34 Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282 2024-12-24 17:45:16 +08:00
liuyang
275d3319c8 feat:[REQ-3282] 增加异常处理类 2024-12-24 17:45:11 +08:00