FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,179 Commits 1 Branch 0 Tags
4b9b44f050751e76dbcbe6c22fcce4454de1853b
Commit Graph
1179 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
super_liu 4b9b44f050 feat: There is no way the, 2021-11-11 12:47:45 +08:00
super_liu c333bd9e3e feat: There is no way the, 2021-11-10 12:57:30 +08:00
super_liu 9f36cb53d7 feat: There is no way the, 2021-11-09 12:26:15 +08:00
super_liu 4f86942ea2 feat: There is no way the, elasticsearch 2021-11-09 10:22:51 +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
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
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 8af54bab9c Merge remote-tracking branch 'origin/develop_migration' into develop_migration 2021-11-01 17:59:49 +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 e22aa58bd5 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-11-01 13:59:41 +08:00
yuezhihang e4c5ae815f 标准法规清单-选择标准法规按钮无法勾选bug修复 && 流程查询生产线初步修改 2021-11-01 13:59:32 +08:00
super_liu 7eb806ed14 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!213
 2021-11-01 09:58:00 +08:00
super_liu 78b458a361 Merge branch 'develop_master' into develop_migration 2021-11-01 09:57:05 +08:00
super_liu f54c8ea63b feat: There is no way the,laws 2021-11-01 09:43:13 +08:00
super_liu 4b1f6503e6 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, LAWS

See merge request LiuChao/foton-slrs-system-rest!212
 2021-10-30 21:08:29 +08:00
super_liu 6f7e92f686 feat: There is no way the, LAWS 2021-10-30 21:06:07 +08:00
super_liu 495f3c72ee feat: There is no way the 2021-10-30 12:42:25 +08:00
super_liu 148cdd5d42 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!211
 2021-10-30 00:56:26 +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
yuezhihang 539cf47101 清单 流程回退 2021-10-29 14:02:47 +08:00
super_liu 62c18594db feat: There is no way the Laws 2021-10-28 18:10:31 +08:00