FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,321 Commits 1 Branch 0 Tags
1ef5a5fc385c5d9c267c63cdb3aa4ff7d4e6d1d3
Commit Graph
1321 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
王夏晖 1ef5a5fc38 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!249
 2021-11-23 21:43:37 +08:00
王夏晖 36c91409fa Merge branch 'develop_3' into 'develop_master' 
commit

See merge request LiuChao/foton-slrs-system-rest!248
 2021-11-23 21:40:38 +08:00
zhaokaiyao@91isoft.com 3c7e00b1d5 commit 2021-11-23 21:29:09 +08:00
Superman_Main 5f16c6fd62 Merge branch 'develop_master' into FOTON 2021-11-23 21:16:46 +08:00
super_liu e1ee94ad1a Merge branch 'develop_3' into 'develop_master' 
当文件被拆分后才在详情显示分解单按钮,取消拆分后自动导入分解单

See merge request LiuChao/foton-slrs-system-rest!247
 2021-11-23 21:06:34 +08:00
zhaokaiyao@91isoft.com 9fcb1aa84f commit 2021-11-23 20:54:12 +08:00
yuezhihang 0f8bc78441 查询代办的新接口 目前只有标准号 标准名称 和 标准类型 的查询 2021-11-23 17:02:16 +08:00
zhaokaiyao@91isoft.com 79f0dd6c90 当文件被拆分后才在详情显示分解单按钮,取消拆分后自动导入分解单 2021-11-23 16:33:49 +08:00
yuezhihang 32fc6eb43a 风险程度 修改接口 目前是根据数据批量修改 重点是时间 因为时间能保持数据的唯一性 2021-11-23 14:46:47 +08:00
yuezhihang ce7a6656b4 新增风险程度字段 2021-11-23 13:49:44 +08:00
yuezhihang 48bde6960b 解决比对标准名称和标准号不回显问题 2021-11-23 10:46:54 +08:00
yuezhihang 804a946717 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-11-23 09:48:19 +08:00
yuezhihang 3474649cd5 ocr新按钮查询 2021-11-23 09:48:09 +08:00
Superman_Main 56401bbc35 Merge branch 'develop_master' into FOTON 2021-11-22 22:58:57 +08:00
super_liu 65391b493f Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!246
 2021-11-22 22:58:19 +08:00
Superman_Main 90f15e4401 feat: There is no way the, 2021-11-22 22:57:43 +08:00
Superman_Main 6fb285c137 Merge branch 'develop_master' into FOTON 2021-11-22 22:28:29 +08:00
super_liu 75619ee182 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!245
 2021-11-22 22:26:39 +08:00
super_liu a8f0c4977c Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!244
 2021-11-22 22:26:13 +08:00
Superman_Main 8985e3e472 feat: There is no way the, 2021-11-22 22:25:24 +08:00
zhaokaiyao@91isoft.com 3b3f59eb26 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-11-22 16:20:47 +08:00
yuezhihang f08ffeb475 方法提取 2021-11-22 13:44:20 +08:00
zhaokaiyao@91isoft.com b6d74b3f57 commit 2021-11-22 10:53:47 +08:00
Superman_Main 729fda34f3 Merge branch 'develop_master' into FOTON 2021-11-22 09:53:08 +08:00
yuezhihang 7a5787d0ad Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-11-22 09:26:40 +08:00
yuezhihang 7e6ee28c2e 预警查询 2021-11-22 09:26:27 +08:00
Superman_Main 0a39e89c8e Merge branch 'develop_master' into FOTON 2021-11-21 20:34:31 +08:00
super_liu ad4b9c0998 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!241
 2021-11-21 20:34:02 +08:00
zhaokaiyao@91isoft.com 44ce02810a 详情,标准分解单关联条款 2021-11-21 16:12:46 +08:00
zhaokaiyao@91isoft.com ed94475d72 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-11-21 11:25:02 +08:00
zhaokaiyao@91isoft.com 723569fbd7 标准类别排序相同顺序按名称排序 2021-11-21 10:21:25 +08:00
Superman_Main ed128e1403 feat: There is no way the 2021-11-20 16:46:00 +08:00
Superman_Main 09ebe8f394 feat: There is no way the 2021-11-20 11:31:26 +08:00
Superman_Main 97626172d8 Merge branch 'develop_master' into FOTON 2021-11-20 11:24:42 +08:00
yuezhihang 8572e2a650 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-11-19 16:51:21 +08:00
yuezhihang d23f7478ae 产品线新增查询条件 以及bug修复 2021-11-19 16:51:10 +08:00
2510220824 fa76e1eb6c update:更新拆分图片存储位置 2021-11-19 15:14:23 +08:00
super_liu 3121c1be9a Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!240
 2021-11-19 14:54:25 +08:00
Superman_Main 04aa88fffa feat: There is no way the, 2021-11-19 14:53:21 +08:00
Superman_Main 6729d40996 Merge branch 'develop_master' into develop_migration 2021-11-19 14:34:21 +08:00
zhaokaiyao@91isoft.com bd0ace0fcb Merge branch 'develop_master' into develop_3 2021-11-19 14:29:43 +08:00
zhaokaiyao@91isoft.com 7f620c68f6 政策重点认证事业部 风险项入库 2021-11-19 14:25:59 +08:00
yuezhihang 7017dff372 Merge remote-tracking branch 'origin/origin/Three' into develop_master 2021-11-19 13:54:14 +08:00
yuezhihang 35591e8e86 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-11-19 13:54:07 +08:00
yuezhihang 0f704dde0a Merge remote-tracking branch 'origin/origin/Three' into develop_master 2021-11-19 13:43:23 +08:00
2510220824 6ba96a22ea update:新增拆分图片路径配置 2021-11-19 11:25:57 +08:00
2510220824 da69053af6 Merge remote-tracking branch 'origin/develop_master' into FOTON_RELEASE 
# Conflicts:
#	adc-da-main/src/main/resources/application-dev.properties
 2021-11-19 11:24:00 +08:00
2510220824 4894c59ebd Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-11-19 11:20:50 +08:00
liao 5abbc7edd9 ~ 2021-11-19 11:19:42 +08:00
2510220824 9dc1eca724 update:文档拆分图片存储路径入配置文件 2021-11-19 11:19:11 +08:00