wangli/orgmanax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
600 Commits 1 Branch 0 Tags 2.5 MiB
40852c840a
Commit Graph

600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
宋远伦
1ae97488dc Merge branch 'feature/REQ-3282-syl' into 'feature/REQ-3282' 
feat(REQ-3282): 项目班组、单位隐私的枚举类定义

See merge request universal/infrastructure/backend/orgmanax!49
 2024-12-26 10:52:01 +00:00
songyuanlun
ce5e2f6851 feat(REQ-3282): 项目班组、单位隐私的枚举类定义 2024-12-26 18:51:13 +08:00
liuyang
07e8782b20 Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488 2024-12-26 18:31:30 +08:00
liuyang
eb7379387c feat:[REQ-3282] 填充组织节点的查询接口 2024-12-26 18:31:23 +08:00
宋远伦
9753bae509 Merge branch 'feature/REQ-3488-syl' into 'feature/REQ-3488' 
feat(REQ-3488): 调整岗位常量类

See merge request universal/infrastructure/backend/orgmanax!47
 2024-12-26 10:12:04 +00:00
张弘昊
04589a253e Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488' 
Feature/req 3488 zhh

See merge request universal/infrastructure/backend/orgmanax!46
 2024-12-26 10:10:40 +00:00
zhanghonghao
1f57e58a62 Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3488' into feature/REQ-3488-zhh 2024-12-26 18:10:09 +08:00
zhanghonghao
b5a7d1cd9a feat(REQ-3488): 调整字段定义 2024-12-26 18:09:54 +08:00
songyuanlun
a590c54260 feat(REQ-3488): 调整岗位常量类 2024-12-26 18:08:51 +08:00
zhanghongbo
9a47414d26 feat(REQ-3282): 增加班组日志分页查询 2024-12-26 17:48:39 +08:00
张弘昊
e169a0a178 Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488' 
Feature/req 3488 zhh

See merge request universal/infrastructure/backend/orgmanax!45
 2024-12-26 09:06:54 +00:00
zhanghonghao
200e7e05cb feat(REQ-3488): 提交企业相关的查询接口实现 2024-12-26 17:06:13 +08:00
zhanghonghao
733748849e Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3488' into feature/REQ-3488-zhh 2024-12-26 17:03:29 +08:00
zhanghonghao
028c067bcc feat(REQ-3488): 提交企业相关的查询接口实现 2024-12-26 17:02:43 +08:00
liuyang
1d3d998ec7 Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488 2024-12-26 16:22:57 +08:00
liuyang
fa15a4c4e7 feat:[REQ-3282] 填充协同关系查询接口 2024-12-26 16:22:47 +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
d386eb2c2a Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3282' into feature/REQ-3488 
# Conflicts:
#	orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/service/impl/QualificationServiceImpl.java
 2024-12-26 15:17:30 +08:00
zhanghonghao
4805d68ead Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3488-zhh' into feature/REQ-3488 2024-12-26 15:16:37 +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
61d020f945 Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3282' into feature/REQ-3488 2024-12-26 13:34:24 +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
liuyang
4f36fcb0a3 feat:[REQ-3282] 实现二期协同关系代码逻辑 2024-12-26 11:27:20 +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