FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,802 Commits 1 Branch 0 Tags
06c14bd8cd54af524f44094de2a83e25fd7839f5
Commit Graph
1802 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mr.Z 0eecf9f3bc Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-11-09 14:53:28 +08:00
Mr.Z 6ac3dfe9b3 资料中心管理相关 2021-11-09 14:52:51 +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
zhaokaiyao@91isoft.com 2769bd7323 重点标准跟踪清单curd接口 2021-11-08 20:53:21 +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
yanyizhou 2da8ecb171 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-11-07 10:25:32 +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
super_liu e0430dfe5e Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!217
 2021-11-03 17:55:35 +08:00
super_liu 13c66d6b5b feat: There is no way the, tree 2021-11-03 17:35:14 +08:00
super_liu 51ca9f08fe feat: There is no way the, elasticsearch setTrackTotalHits(true) 2021-11-03 16:40:29 +08:00
super_liu 1b91101f58 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!216
 2021-11-03 15:49:21 +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
zhaokaiyao@91isoft.com 60bd72ce14 Merge remote-tracking branch 'origin/develop_master' into develop_3 
# Conflicts:
#	adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java
 2021-11-03 13:51:29 +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
zhaokaiyao@91isoft.com f87438832f 政策征求意见, 认证重点法规/政策 流程 2021-11-03 10:29:32 +08:00
Kevin 8a729c1d72 Merge remote-tracking branch 'origin/develop_master' into develop_1 
# Conflicts:
#	adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java
 2021-11-03 10:25:31 +08:00