 liao
|
3ae99e744b
|
Merge remote-tracking branch 'origin/origin/Three' into origin/Three
# Conflicts:
# adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java
|
2021-11-18 11:15:08 +08:00 |
|
|
liao
|
6f1161e89e
|
~
|
2021-11-18 11:14:34 +08:00 |
|
|
Kevin
|
9c2b5408ea
|
zcr:数据信息统计表
|
2021-11-17 17:18:37 +08:00 |
|
|
liao
|
bca00a0b5d
|
~
|
2021-11-16 17:29:49 +08:00 |
|
|
liao
|
7e16815b2d
|
~
|
2021-11-16 16:19:56 +08:00 |
|
|
liao
|
11baf7eda5
|
~
|
2021-11-16 14:27:54 +08:00 |
|
|
Kevin
|
a5d0745aa0
|
zcr:数据信息统计表
|
2021-11-16 09:17:06 +08:00 |
|
|
liao
|
303640aa27
|
~
|
2021-11-15 14:35:40 +08:00 |
|
|
liao
|
a15f3f4934
|
~
|
2021-11-15 13:36:58 +08:00 |
|
|
Kevin
|
690504bddd
|
zcr:数据信息统计表
|
2021-11-15 10:01:54 +08:00 |
|
|
Kevin
|
da9e23196e
|
zcr:日历--标准化活动日程
|
2021-11-11 16:17:31 +08:00 |
|
|
Kevin
|
b74db49da3
|
Merge remote-tracking branch 'origin/develop_master' into origin/Three
|
2021-11-10 14:13:12 +08:00 |
|
|
yuezhihang
|
139911ff51
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-11-10 13:52:50 +08:00 |
|
|
yuezhihang
|
2dcb38a066
|
数据库时间差问题修改
|
2021-11-10 13:52:36 +08:00 |
|
|
super_liu
|
d6432e2746
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,
See merge request LiuChao/foton-slrs-system-rest!226
|
2021-11-10 13:16:27 +08:00 |
|
|
super_liu
|
c333bd9e3e
|
feat: There is no way the,
|
2021-11-10 12:57:30 +08:00 |
|
|
yuezhihang
|
6dedfa9ea4
|
工作组 新增方法
|
2021-11-10 09:32:22 +08:00 |
|
|
yuezhihang
|
80a6df7ef6
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-11-09 14:21:00 +08:00 |
|
|
yuezhihang
|
c4a26fa385
|
清单下拉填充bug修复
|
2021-11-09 14:20:44 +08:00 |
|
|
super_liu
|
ea7a3bc365
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,
See merge request LiuChao/foton-slrs-system-rest!225
|
2021-11-09 12:27:16 +08:00 |
|
|
super_liu
|
9f36cb53d7
|
feat: There is no way the,
|
2021-11-09 12:26:15 +08:00 |
|
|
super_liu
|
def632b24d
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, elasticsearch
See merge request LiuChao/foton-slrs-system-rest!224
|
2021-11-09 10:24:11 +08:00 |
|
|
super_liu
|
4f86942ea2
|
feat: There is no way the, elasticsearch
|
2021-11-09 10:22:51 +08:00 |
|
|
yuezhihang
|
e12f595891
|
查人组件 名称修改
|
2021-11-08 17:25:33 +08:00 |
|
|
yuezhihang
|
85a4b19b47
|
清单查询速度优化
|
2021-11-08 15:33:18 +08:00 |
|
|
yuezhihang
|
d970690908
|
选人组件修改
|
2021-11-08 14:48:35 +08:00 |
|
|
yuezhihang
|
049d9dbb81
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-11-08 13:55:44 +08:00 |
|
|
yuezhihang
|
b38cfc2a01
|
下拉填充
|
2021-11-08 13:55:35 +08:00 |
|
|
super_liu
|
a1908e1457
|
feat: There is no way the
|
2021-11-08 11:42:02 +08:00 |
|
|
yuezhihang
|
82de89f8c2
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-11-07 19:04:35 +08:00 |
|
|
yuezhihang
|
1e61e5cfb4
|
清单查询bug
|
2021-11-07 19:00:08 +08:00 |
|
|
yuezhihang
|
438ee5ff5f
|
合规评估-标准维度查询不出来bug修复 以及导出接口白名单
|
2021-11-07 17:00:49 +08:00 |
|
|
super_liu
|
f7b0296cef
|
Merge branch 'develop_migration' into 'develop_master'
Develop migration
See merge request LiuChao/foton-slrs-system-rest!223
|
2021-11-07 16:50:34 +08:00 |
|
|
super_liu
|
8b401b8832
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request LiuChao/foton-slrs-system-rest!222
|
2021-11-07 16:49:22 +08:00 |
|
|
super_liu
|
39a61ad8dc
|
feat: There is no way the, elasticsearch
|
2021-11-07 16:45:29 +08:00 |
|
|
super_liu
|
0e8c361fc2
|
feat: There is no way the, elasticsearch
|
2021-11-07 16:00:59 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
f0ed2b769d
|
流程详情导出时的审批意见问题
|
2021-11-07 15:51:34 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
541c93a5bb
|
标准号,标准名称分开搜索
|
2021-11-07 14:53:01 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
3f32907acf
|
过内外标准发布日期排序
|
2021-11-07 13:47:03 +08:00 |
|
|
super_liu
|
720a8b45d9
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,
See merge request LiuChao/foton-slrs-system-rest!220
|
2021-11-06 23:19:18 +08:00 |
|
|
super_liu
|
8b12a63925
|
feat: There is no way the,
|
2021-11-06 23:17:29 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
f9a39a330b
|
重点认证标准/政策合规性项目审核流程纳入问题管控
|
2021-11-05 17:50:54 +08:00 |
|
|
yuezhihang
|
1b45458739
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-11-05 17:42:35 +08:00 |
|
|
yuezhihang
|
fbd235b655
|
工作组 相关代码 表关联以及增删改查
|
2021-11-05 17:42:27 +08:00 |
|
|
super_liu
|
922be6d2ce
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, #50742
See merge request LiuChao/foton-slrs-system-rest!219
|
2021-11-05 10:54:49 +08:00 |
|
|
super_liu
|
3171ce4622
|
feat: There is no way the, #50742
|
2021-11-05 10:51:36 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
ff76f0457d
|
政策征求意见导出
|
2021-11-04 15:21:07 +08:00 |
|
|
super_liu
|
437ee87041
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, viewer font size 20
See merge request LiuChao/foton-slrs-system-rest!218
|
2021-11-04 10:59:44 +08:00 |
|
|
super_liu
|
0f0273bef6
|
feat: There is no way the, viewer font size 20
|
2021-11-04 10:58:20 +08:00 |
|
|
Kevin
|
31f9790e61
|
zcr:标准化活动会后流程
|
2021-11-04 10:12:51 +08:00 |
|