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
Superman_Main 0b69fc9e65 Merge branch 'develop_master' into develop_migration 2021-11-27 19:51:44 +08:00
Superman_Main 5c4f8108d7 feat: There is no way the, 2021-11-27 19:50:56 +08:00
zhaokaiyao@91isoft.com eeaf62845d Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-11-27 14:14:40 +08:00
zhaokaiyao@91isoft.com 419f519430 关联模块 2021-11-27 14:14:18 +08:00
super_liu c8fe351362 Merge branch 'develop_3' into 'develop_master' 
vpps数据显示

See merge request LiuChao/foton-slrs-system-rest!252
 2021-11-26 21:24:46 +08:00
zhaokaiyao@91isoft.com c209bb485c 关联模块 2021-11-26 20:29:21 +08:00
yuezhihang 4c31f54a5e 11.26 项目维度 查询标准数据接口修改1 2021-11-26 16:41:50 +08:00
张超然 b49935bbe8 zcr:统计表的一些修改 2021-11-26 14:45:38 +08:00
zhaokaiyao@91isoft.com 9000a6e3fe vpps数据显示 2021-11-26 10:57:58 +08:00
Superman_Main 2d85ecfaa9 Merge branch 'develop_master' into FOTON 2021-11-26 08:58:33 +08:00
super_liu 93a6c6034d Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!251
 2021-11-26 08:58:00 +08:00
Superman_Main 967fccbfb5 Merge branch 'develop_master' into FOTON 2021-11-26 08:55:29 +08:00
zhaokaiyao@91isoft.com 9818f55eca vpps懒加载查询 2021-11-25 18:06:42 +08:00
yuezhihang 08853080db 未符合项整改 -新增和修改 2021-11-25 17:24:45 +08:00
zhaokaiyao@91isoft.com d220eb2f07 解决了完全体的小bug 2021-11-24 17:44:42 +08:00
zhaokaiyao@91isoft.com 30447c09e2 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-11-24 17:09:37 +08:00
zhaokaiyao@91isoft.com 496ab17d73 标准预警查询完全体 2021-11-24 17:09:10 +08:00
zhaokaiyao@91isoft.com 81f4444164 标准预警查询完全体 2021-11-24 17:08:25 +08:00
zhaokaiyao@91isoft.com cb06a54a3d 标准预警查询 2021-11-24 13:19:12 +08:00
王夏晖 104fd2656a Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!250
 2021-11-24 12:01:21 +08:00
yuezhihang 6178ba696c ocr按钮 和 拆分按钮 提供数据接口 修改 2021-11-24 11:50:17 +08:00
yuezhihang 3c46d1f88d 11.24 异步操作添加 导出字段删除 查询修改 2021-11-24 10:55:35 +08:00
zhaokaiyao@91isoft.com f92cdd6dc3 预警实体类修改 2021-11-24 09:19:50 +08:00
王夏晖 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
liao 3689771c29 ~ 2021-11-23 09:11:03 +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
yanyizhou 935831c782 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-11-22 09:41:54 +08:00
yuezhihang 7a5787d0ad Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-11-22 09:26:40 +08:00