 yuezhihang
|
e257b13803
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2022-03-18 16:52:03 +08:00 |
|
|
yuezhihang
|
4b8f755b92
|
3-16
|
2022-03-18 16:51:48 +08:00 |
|
|
11528
|
ad61fcf381
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
# Conflicts:
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
|
2022-03-18 16:41:16 +08:00 |
|
|
11528
|
e7ccb5c4d7
|
岗位：操作时间，机构：委员会编辑，项目合规：查询
|
2022-03-18 16:39:37 +08:00 |
|
|
zhangyanduan
|
3c8cb14e32
|
fix: 修复同步搜索中心数据同步接口BUG
|
2022-03-18 15:37:14 +08:00 |
|
|
yuezhihang
|
a6bef4be76
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2022-03-18 13:47:06 +08:00 |
|
|
yuezhihang
|
52b12d4438
|
==判断企标权限接口 api/lawss/sarBussionessStand/checkIsShow
|
2022-03-18 13:46:59 +08:00 |
|
|
super_liu
|
c3a1f804ca
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,
See merge request LiuChao/foton-slrs-system-rest!419
|
2022-03-17 20:12:48 +08:00 |
|
|
super_liu
|
98fc9bbb56
|
feat: There is no way the,
|
2022-03-17 19:59:40 +08:00 |
|
|
yuezhihang
|
9f667ecd51
|
高级查询
|
2022-03-17 17:26:16 +08:00 |
|
|
yuezhihang
|
52c238c02e
|
企业体系
|
2022-03-17 15:13:34 +08:00 |
|
|
yuezhihang
|
99c6771c96
|
3.17 处理体系结构数据接口 以及体系结构数据查询修改
|
2022-03-17 14:56:43 +08:00 |
|
|
zyd
|
0cc7d74faa
|
fix:标记体系查询接口的BUG
|
2022-03-16 22:50:14 +08:00 |
|
|
yuezhihang
|
deab88a7cd
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2022-03-16 18:21:05 +08:00 |
|
|
yuezhihang
|
23b81d878c
|
3-16
|
2022-03-16 18:20:57 +08:00 |
|
|
庄新伟
|
e917c949fc
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2022-03-16 16:28:54 +08:00 |
|
|
庄新伟
|
b20950e6e4
|
岗位管理操作人中文显示
|
2022-03-16 16:28:41 +08:00 |
|
|
zyd
|
b4fa928fe3
|
fix: 优化同步搜索中心接口代码逻辑
|
2022-03-15 21:42:31 +08:00 |
|
|
zyd
|
32f16ee4cf
|
add: 添加处理ES索引数据接口
|
2022-03-15 21:29:36 +08:00 |
|
|
yuezhihang
|
496fb1da4d
|
海外-查看-更新消息，清单由是改为否的时候，清单记录的2
|
2022-03-15 17:24:24 +08:00 |
|
|
yuezhihang
|
6d43442da5
|
未符合项目排序问题
|
2022-03-15 16:30:43 +08:00 |
|
|
庄新伟
|
1379ab889e
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2022-03-15 13:31:40 +08:00 |
|
|
庄新伟
|
f9f4c0c0b4
|
标准预警导出
|
2022-03-15 13:31:28 +08:00 |
|
|
yuezhihang
|
fa2bb29f1a
|
标准预警-导出，将发布日期导出放到一行显示
|
2022-03-14 18:19:25 +08:00 |
|
|
yuezhihang
|
fd1cbe8a79
|
海外-查看-更新消息，清单由是改为否的时候，清单记录的2
|
2022-03-14 17:08:23 +08:00 |
|
|
yuezhihang
|
bbe8114507
|
首页-标准发布，把文本状态为即将实施的逻辑去掉，只遵循标准发布大于系统日期小于实施日期，才能在首页显示
|
2022-03-14 14:17:14 +08:00 |
|
|
庄新伟
|
af846f74e0
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2022-03-14 09:30:10 +08:00 |
|
|
庄新伟
|
bae566fd1f
|
工作组导入导出
|
2022-03-14 09:29:55 +08:00 |
|
|
yuezhihang
|
0d4bc28382
|
3-11 bug 修复
|
2022-03-11 18:10:27 +08:00 |
|
|
yuezhihang
|
2d95a7c31f
|
bug修复
|
2022-03-11 11:29:59 +08:00 |
|
|
super_liu
|
334dfb40f4
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, eeeeeeeeeeeeeeeeees
See merge request LiuChao/foton-slrs-system-rest!417
|
2022-03-08 20:16:38 +08:00 |
|
|
super_liu
|
26f5bdaff1
|
feat: There is no way the, eeeeeeeeeeeeeeeeees
|
2022-03-08 20:15:19 +08:00 |
|
|
super_liu
|
7b7cfcf476
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,
See merge request LiuChao/foton-slrs-system-rest!416
|
2022-03-08 17:48:57 +08:00 |
|
|
super_liu
|
50039d0295
|
feat: There is no way the,
|
2022-03-08 17:48:12 +08:00 |
|
|
super_liu
|
42be7a4c22
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 提提提提
See merge request LiuChao/foton-slrs-system-rest!415
|
2022-03-08 17:02:05 +08:00 |
|
|
super_liu
|
b12a559e02
|
feat: There is no way the, 提提提提
|
2022-03-08 17:01:28 +08:00 |
|
|
yuezhihang
|
0543bdc57b
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2022-03-08 16:47:00 +08:00 |
|
|
yuezhihang
|
26fbf9daf3
|
导入修改
|
2022-03-08 16:46:56 +08:00 |
|
|
super_liu
|
230e035424
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 跑跑跑 跑数据 重置es
See merge request LiuChao/foton-slrs-system-rest!414
|
2022-03-08 16:36:54 +08:00 |
|
|
super_liu
|
c1eeea3f1f
|
feat: There is no way the, 跑跑跑 跑数据 重置es
|
2022-03-08 16:33:33 +08:00 |
|
|
庄新伟
|
e43c86e894
|
工作组导入导出
|
2022-03-08 16:24:05 +08:00 |
|
|
super_liu
|
88809e05d4
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, xxx
See merge request LiuChao/foton-slrs-system-rest!413
|
2022-03-07 17:57:09 +08:00 |
|
|
super_liu
|
f1ac00a8dc
|
feat: There is no way the, xxx
|
2022-03-07 17:56:17 +08:00 |
|
|
super_liu
|
7dc6dd7b74
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, HHH
See merge request LiuChao/foton-slrs-system-rest!412
|
2022-03-07 17:46:00 +08:00 |
|
|
super_liu
|
7e2f0ffe85
|
feat: There is no way the, HHH
|
2022-03-07 17:45:03 +08:00 |
|
|
super_liu
|
73c31e34b2
|
Merge branch 'develop_migration' into 'develop_master'
Develop migration
See merge request LiuChao/foton-slrs-system-rest!411
|
2022-03-07 17:34:18 +08:00 |
|
|
super_liu
|
69c2d4c6e2
|
feat: There is no way the, 重置ES
|
2022-03-07 17:33:25 +08:00 |
|
|
yuezhihang
|
43ef09221d
|
数据字典查询接口 多加一个根据key查询
|
2022-03-07 17:05:11 +08:00 |
|
|
yuezhihang
|
bf5908d27a
|
导入公共方法修改
|
2022-03-07 16:28:21 +08:00 |
|
|
yuezhihang
|
d06dbade9b
|
bug 修复
|
2022-03-07 15:44:44 +08:00 |
|