Commit Graph
783 Commits
Author SHA1 Message Date
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
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
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 b38cfc2a01 下拉填充 2021-11-08 13:55:35 +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 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
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 3171ce4622 feat: There is no way the, #50742 2021-11-05 10:51:36 +08:00
super_liu 13c66d6b5b feat: There is no way the, tree 2021-11-03 17:35:14 +08:00
super_liu 5c46fa1e74 Merge branch 'develop_master' into develop_migration 2021-11-03 15:48:21 +08:00
super_liu 71dde49296 feat: There is no way the,Laws 2021-11-03 15:45:54 +08:00
zhaokaiyao@91isoft.com 89f5d35050 标准excl导入 已知标准类别 2021-11-03 13:53:27 +08:00
super_liu 7e1cc917dd Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!215
2021-11-03 13:05:37 +08:00
super_liu b023cba2d2 feat: There is no way the 2021-11-03 13:04:56 +08:00
super_liu 869bcdbad8 feat: There is no way the 2021-11-03 13:00:33 +08:00
super_liu 3cd3266899 Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!214
2021-11-01 18:03:47 +08:00
super_liu cab90f06ee feat: There is no way the,Laws 2021-11-01 17:59:24 +08:00
yuezhihang d42d9f34f4 标准详情分页查询 ;老版本新接口 2021-11-01 17:23:09 +08:00
yuezhihang e4c5ae815f 标准法规清单-选择标准法规按钮无法勾选bug修复 && 流程查询生产线初步修改 2021-11-01 13:59:32 +08:00
super_liu 6f7e92f686 feat: There is no way the, LAWS 2021-10-30 21:06:07 +08:00
super_liu 1928ae8868 Merge branch 'develop_master' into develop_migration 2021-10-30 00:55:32 +08:00
super_liu 831f8d321a feat: There is no way the 2021-10-29 23:53:33 +08:00
super_liu 62c18594db feat: There is no way the Laws 2021-10-28 18:10:31 +08:00
yuezhihang 0d18758178 项目评估流程标准维度-查询数据来源修复 2021-10-27 13:47:29 +08:00
yuezhihang 9ec34d5125 Merge remote-tracking branch 'origin/develop_master' into develop_master
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
2021-10-27 13:39:58 +08:00
yuezhihang d02b73e2dd 标准库查询 和 流程发起界面查询 做了一个标志位的区分 目的是为了提高标准库的查询速度 2021-10-27 13:39:07 +08:00
super_liu 2504cac460 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-10-27 13:36:09 +08:00