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

603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
liuyang
1403131b38 Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488 2025-01-13 11:07:20 +08:00
liuyang
28518628a2 feat:[REQ-3488] 增加默认值 2025-01-13 11:07:15 +08:00
宋远伦
83d3edae74 Merge branch 'feature/REQ-3488-syl' into 'feature/REQ-3488' 
feat(REQ-3488): 岗位恢复查询角色信息相关逻辑

See merge request universal/infrastructure/backend/orgmanax!165
 2025-01-13 02:56:56 +00:00
songyuanlun
a623410550 feat(REQ-3488): 岗位恢复查询角色信息相关逻辑 2025-01-13 10:56:10 +08:00
zhanghongbo
9025aa237c feat(REQ-3488): 提交获取小组接口 2025-01-13 10:27:47 +08:00
zhanghongbo
5c49746121 Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488 
# Conflicts:
#	orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/node/req/ListNodeReq.java
 2025-01-13 10:19:46 +08:00
zhanghongbo
5846b213e5 feat(REQ-3488): 提交获取小组接口 2025-01-13 10:18:44 +08:00
liuyang
f541b831fd feat:[REQ-3488] 解决冲突 2025-01-13 10:17:55 +08:00
liuyang
00024a0b5e Merge branch 'master' into feature/REQ-3488 
# Conflicts:
#	orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/event/config/RocketMQEventConfig.java
 2025-01-13 10:15:19 +08:00
张弘昊
08e9f7a21c Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488' 
feat(REQ-3488): 创建企业注册历史接口实现

See merge request universal/infrastructure/backend/orgmanax!163
 2025-01-10 09:27:52 +00:00
zhanghonghao
9e44459378 feat(REQ-3488): 创建企业注册历史接口实现 2025-01-10 17:27:13 +08:00
张弘昊
601a938f7e Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488' 
feat(REQ-3488): 资质申请更新接口

See merge request universal/infrastructure/backend/orgmanax!161
 2025-01-10 09:00:29 +00:00
zhanghonghao
c2cf7ea9cb feat(REQ-3488): 资质申请更新接口 2025-01-10 16:59:33 +08:00
liuyang
60bc9a2f1a Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488 2025-01-10 15:57:31 +08:00
liuyang
327dc28543 feat:[REQ-3488] 去重兜底 2025-01-10 15:57:26 +08:00
张弘昊
0254ecf85c Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488' 
feat(REQ-3488): 确认时间支持查空

See merge request universal/infrastructure/backend/orgmanax!159
 2025-01-10 07:46:23 +00:00
zhanghonghao
94df94a1c6 feat(REQ-3488): 确认时间支持查空 2025-01-10 15:45:21 +08:00
liuyang
65dc8623bc feat:[REQ-3488] 将聚合类代码抽象到私有方法中，并且优 2025-01-10 15:43:34 +08:00
liuyang
1fff982c1b Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488 2025-01-10 15:31:19 +08:00
liuyang
5cc3f2a7a0 feat:[REQ-3488] 实现profile筛选 2025-01-10 15:30:58 +08:00
张弘昊
082cf54586 Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488' 
feat(REQ-3488): 调整参数superBuilder

See merge request universal/infrastructure/backend/orgmanax!157
 2025-01-10 07:27:05 +00:00
zhanghonghao
4dd072a887 feat(REQ-3488): 调整参数superBuilder 2025-01-10 15:26:33 +08:00
宋远伦
ed85cc9db9 Merge branch 'feature/REQ-3488-syl' into 'feature/REQ-3488' 
feat(REQ-3488): 班组类别api 逻辑调整

See merge request universal/infrastructure/backend/orgmanax!155
 2025-01-10 07:18:52 +00:00
songyuanlun
cf8d6a8080 feat(REQ-3488): 班组类别api 逻辑调整 2025-01-10 15:11:47 +08:00
张弘昊
1a9f2cc1ec Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488' 
Feature/req 3488 zhh

See merge request universal/infrastructure/backend/orgmanax!153
 2025-01-10 06:58:52 +00:00
zhanghonghao
1e9f94b3b3 Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488-zhh 2025-01-10 14:58:21 +08:00
zhanghonghao
d1afcd27bb feat(REQ-3488): 实现单位注册接口 2025-01-10 14:58:09 +08:00
liuyang
f70d1ec9d3 feat:[REQ-3488] 抽到独立的类中维护, 减少service类臃肿 2025-01-10 14:04:17 +08:00
张弘昊
0c3ab7adad Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488' 
Feature/req 3488 zhh

See merge request universal/infrastructure/backend/orgmanax!151
 2025-01-10 03:36:14 +00:00
zhanghonghao
a6c3e41ff6 Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488-zhh 2025-01-10 11:35:46 +08:00
zhanghonghao
2734288c63 feat(REQ-3488): 实现单位联系人新增\删除 查询接口 2025-01-10 11:35:31 +08:00
liuyang
7f0a2b2674 Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488 2025-01-10 09:41:46 +08:00
liuyang
5d02e8c988 feat:[REQ-3488] 测试协同关系列表接口, 修复BUG 2025-01-10 09:41:39 +08:00
张弘昊
d17229bc6c Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488' 
Feature/req 3488 zhh

See merge request universal/infrastructure/backend/orgmanax!149
 2025-01-10 01:39:03 +00:00
zhanghonghao
b45c32ca74 Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488-zhh 2025-01-10 09:38:33 +08:00
zhanghonghao
33ef364931 feat(REQ-3488): 单位查询加参数 2025-01-10 09:38:24 +08:00
周敏
95ba0bd0ce Merge remote-tracking branch 'origin/feature/REQ-3282' 2025-01-09 21:58:57 +08:00
宋远伦
8127a63b67 Merge branch 'feature/REQ-3488-syl' into 'feature/REQ-3488' 
feat(REQ-3488): 班组类别api调整

See merge request universal/infrastructure/backend/orgmanax!147
 2025-01-09 10:30:29 +00:00
songyuanlun
d30990fd71 feat(REQ-3488): 班组类别api调整 2025-01-09 18:29:59 +08:00
宋远伦
a1cc81d355 Merge branch 'feature/REQ-3488-syl' into 'feature/REQ-3488' 
feat(REQ-3488): 班组类别树形查询逻辑调整

See merge request universal/infrastructure/backend/orgmanax!145
 2025-01-09 09:23:38 +00:00
songyuanlun
aa189fdc21 feat(REQ-3488): 班组类别树形查询逻辑调整 2025-01-09 17:22:57 +08:00
张弘昊
fa3f36fe98 Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488' 
Feature/req 3488 zhh

See merge request universal/infrastructure/backend/orgmanax!143
 2025-01-09 08:28:46 +00:00
zhanghonghao
16e9a6b749 Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488-zhh 2025-01-09 16:28:02 +08:00
zhanghonghao
8820fa4dca feat(REQ-3488): 调整联系人获取接口 2025-01-09 16:27:23 +08:00
zhanghongbo
5ddfcaaefc feat(REQ-3488): 提交获取小组下工人接口 2025-01-09 15:55:43 +08:00
zhanghongbo
1141598228 feat(REQ-3488): 修改获取工人id， 班组id方法 2025-01-09 14:32:31 +08:00
宋远伦
67cbabdebd Merge branch 'feature/REQ-3488-syl' into 'feature/REQ-3488' 
feat(REQ-3488): 构建二方依赖所需的业务范围拼接方法

See merge request universal/infrastructure/backend/orgmanax!141
 2025-01-09 06:25:51 +00:00
songyuanlun
b67f365607 feat(REQ-3488): 构建二方依赖所需的业务范围拼接方法 2025-01-09 14:25:00 +08:00
宋远伦
42eeb92bac Merge branch 'feature/REQ-3488-syl' into 'feature/REQ-3488' 
Feature/req 3488 syl

See merge request universal/infrastructure/backend/orgmanax!139
 2025-01-09 06:02:24 +00:00
songyuanlun
27cd892f53 feat(REQ-3488): 班组类别树形接口调整上级节点字段 2025-01-09 14:01:39 +08:00