FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,385 Commits 1 Branch 0 Tags
ffde83f71eb3b9c70fe24d8d57fa735b4037510f
Commit Graph
1385 Commits
This Branch
This Branch
All Branches
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
yuezhihang 51e67d4440 删除草稿接口 api/lawss/activiti/delCG 2021-12-05 15:50:46 +08:00
yuezhihang 7f88babb5f 项目清单加字段 ！ 白名单添加一个导出 2021-12-05 15:09:19 +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
王夏晖 c1e1f8a495 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!266
 2021-12-02 21:16:11 +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
张超然 90d92b4a16 zcr:链接图标文件流 2021-12-02 10:18:04 +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 db899732c3 预警 定时任务 2021-12-01 19:11:11 +08:00
zhaokaiyao@91isoft.com 3e48e5f4f5 预警 定时任务 2021-12-01 19:11:01 +08:00
zhaokaiyao@91isoft.com 960ea90b4a 预警 定时任务 2021-12-01 19:08:59 +08:00
zhaokaiyao@91isoft.com 90d84a7443 模块结构单元 2021-12-01 19:00:55 +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
zhaokaiyao@91isoft.com f76e0aabe5 取消事务 2021-12-01 16:49:45 +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 03b8e3ee67 预警区间 2021-12-01 11:27:34 +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
王夏晖 bc4529bf03 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!258
 2021-11-30 22:49:46 +08:00
zhaokaiyao@91isoft.com cd86b4a30c vpps查询第一层目录 2021-11-30 21:08:21 +08:00
zhaokaiyao@91isoft.com b43cc664e2 //todo 2021-11-30 20:47:46 +08:00
zhaokaiyao@91isoft.com 25d8f1bdf7 重点问题跟踪新增判断是否重复 2021-11-30 20:47:46 +08:00
王夏晖 878bc07e61 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!256
 2021-11-30 19:09:28 +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 519ac979ad Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-11-29 22:47:10 +08:00
zhaokaiyao@91isoft.com 56c94ac3d6 ssrq为空时显示空 2021-11-29 22:46:51 +08:00
super_liu 7371b18a52 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!255
 2021-11-29 16:15:20 +08:00
Superman_Main 0d43dde5f6 feat: There is no way the, 2021-11-29 16:14:38 +08:00