宋远伦
|
6351fb5c24
|
Merge branch 'feature/REQ-3488-syl' into 'feature/REQ-3488'
feat(REQ-3488): 班组类别调整平台班组查询逻辑
See merge request universal/infrastructure/backend/orgmanax!175
|
2025-01-14 03:52:32 +00:00 |
|
songyuanlun
|
22883d3ed4
|
feat(REQ-3488): 班组类别调整平台班组查询逻辑
|
2025-01-14 11:52:02 +08:00 |
|
张弘昊
|
917179ed85
|
Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488'
Feature/req 3488 zhh
See merge request universal/infrastructure/backend/orgmanax!173
|
2025-01-13 10:10:53 +00:00 |
|
zhanghonghao
|
aa7abc347c
|
Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488-zhh
|
2025-01-13 18:10:17 +08:00 |
|
zhanghonghao
|
1b7e2aa24f
|
feat(REQ-3488): 添加审批人字段
|
2025-01-13 18:09:43 +08:00 |
|
liuyang
|
94fd1421c8
|
feat:[REQ-3488] 自测, 解决json查询报错问题
|
2025-01-13 17:29:32 +08:00 |
|
liuyang
|
ffa22f6f7c
|
feat:[REQ-3488] 自测, 解决json查询报错问题
|
2025-01-13 17:25:02 +08:00 |
|
liuyang
|
2497d7d77c
|
feat:[REQ-3488] 自测, 解决json查询报错问题
|
2025-01-13 17:07:41 +08:00 |
|
liuyang
|
69d52a8e18
|
feat:[REQ-3488] 删除无用的依赖
|
2025-01-13 16:13:29 +08:00 |
|
liuyang
|
4ccd1d5393
|
feat:[REQ-3488] 修复BUG
|
2025-01-13 16:05:54 +08:00 |
|
liuyang
|
46a70312d2
|
feat:[REQ-3488] 过滤入参中集合类型中可能有null值的元素
|
2025-01-13 16:04:15 +08:00 |
|
liuyang
|
9720d8d8b0
|
feat:[REQ-3488] 过滤入参中集合类型中可能有null值的元素
|
2025-01-13 16:01:14 +08:00 |
|
liuyang
|
7a22e944c4
|
feat:[REQ-3488] 过滤入参中集合类型中可能有null值的元素
|
2025-01-13 15:50:59 +08:00 |
|
liuyang
|
7f329ee8c8
|
feat:[REQ-3488] 对ownerProjectWorkerIds字段查询进行实现
|
2025-01-13 15:42:07 +08:00 |
|
张弘昊
|
8ebac1dcb5
|
Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488'
feat(REQ-3488): 去掉platTeam冗余字段
See merge request universal/infrastructure/backend/orgmanax!171
|
2025-01-13 06:53:36 +00:00 |
|
zhanghonghao
|
324b25834a
|
feat(REQ-3488): 去掉platTeam冗余字段
|
2025-01-13 14:52:33 +08:00 |
|
张弘昊
|
3877b11c04
|
Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488'
Feature/req 3488 zhh
See merge request universal/infrastructure/backend/orgmanax!169
|
2025-01-13 06:44:24 +00:00 |
|
zhanghonghao
|
42048a507e
|
feat(REQ-3488): 去掉小组冗余字段
|
2025-01-13 14:43:10 +08:00 |
|
zhanghonghao
|
8cb7d59ff8
|
Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488-zhh
# Conflicts:
# orgmanax-server/src/main/java/cn/axzo/orgmanax/server/project/team/service/impl/ProjectTeamServiceImpl.java
|
2025-01-13 14:41:52 +08:00 |
|
zhanghonghao
|
f85ccefc0e
|
feat(REQ-3488): 去掉小组冗余字段
|
2025-01-13 14:41:09 +08:00 |
|
周敏
|
cafea7b02d
|
feat(server): 移除cn.axzo.orgmanax.dto.node.dto.NodeProfile.PlatTeamProfile 这个类。
|
2025-01-13 11:43:48 +08:00 |
|
宋远伦
|
8a21f5ac26
|
Merge branch 'feature/REQ-3488-syl' into 'feature/REQ-3488'
feat(REQ-3488): 联系人req调整
See merge request universal/infrastructure/backend/orgmanax!167
|
2025-01-13 03:12:57 +00:00 |
|
songyuanlun
|
acd25b5173
|
feat(REQ-3488): 联系人req调整
|
2025-01-13 11:11:47 +08:00 |
|
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 |
|