zhanghonghao
|
4109e0214f
|
feat(REQ-3488): 提供项目内班组列表查询接口
|
2024-12-30 17:59:59 +08:00 |
|
zhanghongbo
|
69631d9981
|
feat(REQ-3488): 增加业务审批关系查询
|
2024-12-30 16:45:20 +08:00 |
|
zhanghongbo
|
30077df494
|
feat(REQ-3488): 增加业务审批关系查询
|
2024-12-30 16:39:24 +08:00 |
|
张弘昊
|
b41cba7874
|
Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488'
Feature/req 3488 zhh
See merge request universal/infrastructure/backend/orgmanax!63
|
2024-12-30 02:42:43 +00:00 |
|
zhanghonghao
|
f59ba102ef
|
feat(REQ-3488): 加上模糊查询的支持
|
2024-12-30 10:42:00 +08:00 |
|
张弘昊
|
d4b2d2bfeb
|
Merge branch 'feature/REQ-3488' into 'feature/REQ-3488-zhh'
Feature/req 3488
See merge request universal/infrastructure/backend/orgmanax!62
|
2024-12-30 01:45:20 +00:00 |
|
zhanghonghao
|
7b711ce29b
|
Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3282' into feature/REQ-3488
|
2024-12-30 09:44:40 +08:00 |
|
周敏
|
692035078f
|
feat(REQ-3282): 完善一批查询接口
|
2024-12-27 18:37:52 +08:00 |
|
张弘昊
|
4f7bce87eb
|
Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488'
Feature/req 3488 zhh
See merge request universal/infrastructure/backend/orgmanax!61
|
2024-12-27 10:21:36 +00:00 |
|
zhanghonghao
|
ce99593caa
|
Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3488' into feature/REQ-3488-zhh
|
2024-12-27 18:20:37 +08:00 |
|
zhanghonghao
|
3ab7f2827e
|
Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3282' into feature/REQ-3488
|
2024-12-27 18:20:12 +08:00 |
|
songyuanlun
|
f35e31b4d5
|
feat(REQ-3282): orgmanx pom 调整
|
2024-12-27 17:32:07 +08:00 |
|
songyuanlun
|
c2a3cc4369
|
feat(REQ-3282): 解决打包编译问题
|
2024-12-27 17:04:24 +08:00 |
|
zhanghonghao
|
878bb5317f
|
Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3488' into feature/REQ-3488-zhh
|
2024-12-27 16:16:17 +08:00 |
|
zhanghongbo
|
dc6a7c65b6
|
feat(REQ-3282): 增加班组日志创建
|
2024-12-27 16:13:35 +08:00 |
|
zhanghonghao
|
fcc08643b9
|
feat(REQ-3488): 联系人手机号加密
|
2024-12-27 14:30:27 +08:00 |
|
zhanghonghao
|
1a0e4c0237
|
feat(REQ-3488): 解决构建问题
|
2024-12-27 13:38:13 +08:00 |
|
张弘昊
|
353ed56cf6
|
Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488'
Feature/req 3488 zhh
See merge request universal/infrastructure/backend/orgmanax!56
|
2024-12-27 03:45:50 +00:00 |
|
zhanghonghao
|
80e8b40c87
|
Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-3488' into feature/REQ-3488-zhh
|
2024-12-27 11:45:28 +08:00 |
|
zhanghonghao
|
8b6115fa13
|
feat(REQ-3488): 提交资质序列/单位类型列表实现
|
2024-12-27 11:45:10 +08:00 |
|
liuyang
|
f0f840be31
|
feat:[REQ-3488] 暂时提交
|
2024-12-27 11:09:27 +08:00 |
|
liuyang
|
56a7b29a24
|
Merge remote-tracking branch 'origin/feature/REQ-3488' into feature/REQ-3488
|
2024-12-27 10:36:55 +08:00 |
|
liuyang
|
f950393393
|
feat:[REQ-3488] 暂时提交
|
2024-12-27 10:36:48 +08:00 |
|
宋远伦
|
4225d1a6bb
|
Merge branch 'feature/REQ-3282' into 'feature/REQ-3488'
Feature/req 3282
See merge request universal/infrastructure/backend/orgmanax!54
|
2024-12-26 11:33:52 +00:00 |
|
宋远伦
|
3ac583690b
|
Merge branch 'feature/REQ-3282-syl' into 'feature/REQ-3282'
feat(REQ-3282): JobDTO 返回值调整
See merge request universal/infrastructure/backend/orgmanax!51
|
2024-12-26 11:27:43 +00:00 |
|
songyuanlun
|
7cf4af6dc0
|
feat(REQ-3282): JobDTO 返回值调整
|
2024-12-26 19:27:05 +08:00 |
|
宋远伦
|
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 |
|