FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,158 Commits 1 Branch 0 Tags
922be6d2ce58bb4bb4423ea86c7ccec29d75de90
Commit Graph
1158 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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 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
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
super_liu c2e7b589d2 feat: There is no way the 2021-10-27 13:35:51 +08:00
yuezhihang a675e374bc 清单 流程回退 2021-10-27 09:38:56 +08:00
yuezhihang 23e70eba5b Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-10-25 15:10:04 +08:00
yuezhihang 59a7702e27 流程最新的发起Key 2021-10-25 15:09:55 +08:00
super_liu 7dcfe2dd03 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!210
 2021-10-25 14:06:41 +08:00
super_liu ac60a29630 feat: There is no way the 2021-10-25 14:05:28 +08:00
super_liu 055c562a99 Merge branch 'develop_master' into develop_migration 2021-10-25 12:01:46 +08:00
super_liu e7b2873362 feat: There is no way the 2021-10-25 11:55:32 +08:00
super_liu 89b4bfdd8d Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!209
 2021-10-22 18:02:44 +08:00
super_liu 3cd41c45d7 feat: There is no way the, TO optimize the query 2021-10-22 17:53:11 +08:00
super_liu 48c3da1bae Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-10-22 17:03:46 +08:00
super_liu 1918e0da78 feat: There is no way the, TO optimize the query 2021-10-22 17:03:29 +08:00
super_liu c604ad2461 feat: There is no way the 2021-10-22 16:04:25 +08:00
super_liu 9eff2340a2 feat: There is no way the, TO optimize the query 2021-10-22 15:50:07 +08:00
zhaokaiyao@91isoft.com ed1762a7ec 标准发布日期查询 2021-10-21 18:25:14 +08:00
zhaokaiyao@91isoft.com 0ee4f63614 项目清单->项目经理 2021-10-21 13:51:27 +08:00