FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,851 Commits 1 Branch 0 Tags
8f650eeb81204a7df214116bf694f254caabd7cf
Commit Graph
530 Commits
Author SHA1 Message Date
王夏晖 ffde83f71e Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!268
 2021-12-05 21:08:16 +08:00
zhaokaiyao@91isoft.com 691e7b6bcc 更新法规是否纳入法规清单 2021-12-05 20:56:32 +08:00
yuezhihang 02edc0ba2e 为符合项 排序 2021-12-05 20:25:49 +08:00
zhaokaiyao@91isoft.com 8ae7ed4dd9 企标评分 2021-12-05 20:23:21 +08:00
zhaokaiyao@91isoft.com 7cd3262d3f 预警排序 2021-12-05 19:57:27 +08:00
zhaokaiyao@91isoft.com 492a5e9622 海外标准号查询 2021-12-05 19:55:40 +08:00
zhaokaiyao@91isoft.com a1fee557af 预警导出 2021-12-05 18:42:51 +08:00
zhaokaiyao@91isoft.com 2d1b55fa76 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-12-05 09:46:16 +08:00
zhaokaiyao@91isoft.com fb04c67b17 企标评分 2021-12-05 09:43:31 +08:00
yuezhihang 505be3cdc9 企标制修订计划模块 半重构o(*￣︶￣*)o 2021-12-03 14:48:31 +08:00
liao dab0c3db12 leo 2021-12-03 11:29:49 +08:00
zhaokaiyao@91isoft.com 41ad39f343 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-12-02 19:36:06 +08:00
zhaokaiyao@91isoft.com 235f81b35c 标准号搜索框可以搜索标准名称 
标准名称搜索框可以搜索标准号
 2021-12-02 17:24:37 +08:00
zhaokaiyao@91isoft.com a7206afc5d 预警 标准实施日期子表 2021-12-02 16:24:40 +08:00
王夏晖 a0924c6893 Merge branch 'origin/Three' into 'develop_master' 
Origin/three

See merge request LiuChao/foton-slrs-system-rest!265
 2021-12-02 10:49:56 +08:00
yuezhihang 542433742b Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-02 10:25:18 +08:00
yuezhihang 0569a33350 评估结果查看 2021-12-02 10:25:10 +08:00
王夏晖 e7302f306d Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!263
 2021-12-01 20:54:21 +08:00
zhaokaiyao@91isoft.com fbca49f8e9 预警 标准名称查询 2021-12-01 20:11:23 +08:00
zhaokaiyao@91isoft.com 852bdf5f77 预警 查询 2021-12-01 19:47:05 +08:00
zhaokaiyao@91isoft.com 960ea90b4a 预警 定时任务 2021-12-01 19:08:59 +08:00
yuezhihang 895289a1a0 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-01 17:59:23 +08:00
yuezhihang 455fc2ba0e 12.1bug修复 2021-12-01 17:59:17 +08:00
super_liu 535a4c392d Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, buss sort

See merge request LiuChao/foton-slrs-system-rest!261
 2021-12-01 15:42:25 +08:00
Superman_Main c27beedaa2 feat: There is no way the, buss sort 2021-12-01 15:41:11 +08:00
zhaokaiyao@91isoft.com 234e4aa036 预警定时任务 2021-12-01 15:31:50 +08:00
super_liu 04c35a2751 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!260
 2021-12-01 14:22:48 +08:00
Superman_Main 7078179608 feat: There is no way the, 2021-12-01 13:42:39 +08:00
zhaokaiyao@91isoft.com e89725a2f7 预警区间 2021-12-01 11:28:23 +08:00
zhaokaiyao@91isoft.com 1973529a69 取消预警 2021-12-01 11:27:07 +08:00
zhaokaiyao@91isoft.com d977214a56 预警查询 2021-12-01 11:25:56 +08:00
zhaokaiyao@91isoft.com da97a60716 国家地区清单查询 2021-11-30 17:40:28 +08:00
张超然 0b2f4b917f Merge branch 'develop_master' into origin/Three 2021-11-30 09:25:34 +08:00
zhaokaiyao@91isoft.com 56c94ac3d6 ssrq为空时显示空 2021-11-29 22:46:51 +08:00
zhaokaiyao@91isoft.com 3117af535b 定时标准预警(不推送) 2021-11-29 14:15:44 +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 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 81f4444164 标准预警查询完全体 2021-11-24 17:08:25 +08:00
zhaokaiyao@91isoft.com cb06a54a3d 标准预警查询 2021-11-24 13:19:12 +08:00
yuezhihang 3c46d1f88d 11.24 异步操作添加 导出字段删除 查询修改 2021-11-24 10:55:35 +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 32fc6eb43a 风险程度 修改接口 目前是根据数据批量修改 重点是时间 因为时间能保持数据的唯一性 2021-11-23 14:46:47 +08:00
liao 3689771c29 ~ 2021-11-23 09:11:03 +08:00
Superman_Main 90f15e4401 feat: There is no way the, 2021-11-22 22:57:43 +08:00
Superman_Main 8985e3e472 feat: There is no way the, 2021-11-22 22:25:24 +08:00
yanyizhou 935831c782 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-11-22 09:41:54 +08:00
zhaokaiyao@91isoft.com ed94475d72 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-11-21 11:25:02 +08:00