FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,870 Commits 1 Branch 0 Tags
59e44f1e7eabaacebc83e6be646287879d75d293
Commit Graph
1870 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
super_liu a4b9f80e9f Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, buss plan planStatusList

See merge request LiuChao/foton-slrs-system-rest!337
 2021-12-29 17:54:50 +08:00
super_liu 5311451b1c feat: There is no way the, buss plan planStatusList 2021-12-29 17:54:07 +08:00
2510220824 f068dacc7f update:pcms车型项目接收到的数据新增3个字段 2021-12-29 17:36:07 +08:00
zhaokaiyao@91isoft.com 466b2d8458 模块结构单元名称 2021-12-29 15:57:01 +08:00
zhaokaiyao@91isoft.com b8c494d4c5 国内外excel导出code转字符 2021-12-29 15:55:58 +08:00
王夏晖 faa18b178e Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!336
 2021-12-29 14:55:15 +08:00
王夏晖 cab273dae4 Merge branch 'develop_3' into 'develop_master' 
标准号查询总数与数据数量不一致

See merge request LiuChao/foton-slrs-system-rest!335
 2021-12-29 14:54:58 +08:00
zhaokaiyao@91isoft.com ad8f68de4c 标准号查询总数与数据数量不一致 2021-12-29 14:24:59 +08:00
王夏晖 4b72908b9e Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!334
 2021-12-29 13:46:58 +08:00
yuezhihang 36ff1dd510 企标计划库新增字段 2021-12-29 10:46:58 +08:00
yuezhihang 76846c8357 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-29 10:44:24 +08:00
yuezhihang 9ed5f88d1c 解读流程 入库数据消失 bug修复 2021-12-29 10:44:16 +08:00
super_liu 3595251fde Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, buss plan add bussSort

See merge request LiuChao/foton-slrs-system-rest!333
 2021-12-29 10:32:01 +08:00
super_liu b63d82a43e feat: There is no way the, buss plan add bussSort 2021-12-29 10:30:45 +08:00
王夏晖 d5cb35f5f5 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!332
 2021-12-29 09:11:33 +08:00
王夏晖 9c39c5e663 Merge branch 'develop_3' into 'develop_master' 
根据标准id查询存在分解单的文本类型

See merge request LiuChao/foton-slrs-system-rest!331
 2021-12-29 09:11:17 +08:00
zhaokaiyao@91isoft.com 4c65fb97d4 根据标准id查询存在分解单的文本类型 2021-12-28 19:41:37 +08:00
super_liu 5af18044be Merge branch 'develop_master' into FOTON 2021-12-28 16:58:23 +08:00
yuezhihang da0eda3020 企标制修订计划库 crud 2021-12-28 16:38:58 +08:00
super_liu f4677d123e Merge branch 'develop_master' into FOTON 2021-12-28 03:39:57 +08:00
yuezhihang 312eb47dfe Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-27 19:50:47 +08:00
yuezhihang f215eeef72 公开征求意见 查询bug修复 2021-12-27 19:50:38 +08:00
王夏晖 915fcac514 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!330
 2021-12-27 18:55:58 +08:00
super_liu 94d5d2e128 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, buss2 process

See merge request LiuChao/foton-slrs-system-rest!329
 2021-12-27 17:47:33 +08:00
super_liu 7e4fbe6ea1 feat: There is no way the, buss2 process 2021-12-27 17:45:51 +08:00
yuezhihang 0bee1e9cf7 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-27 16:51:43 +08:00
yuezhihang 5e8b70c41e 国家地区清单关联之后查询 出现多条重复标准挂载 问题修复 2021-12-27 16:51:35 +08:00
王夏晖 ccfa63fc2a Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!328
 2021-12-27 16:34:49 +08:00
王夏晖 424b84a7fb Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!327
 2021-12-27 16:34:21 +08:00
王夏晖 575a50a399 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!326
 2021-12-27 16:14:57 +08:00
zhaokaiyao@91isoft.com cdffdad6ad 标准导出字典转换 2021-12-27 16:07:29 +08:00
yuezhihang c41a19a1ab 企标制修订计划查询失效bug修复 2021-12-27 15:46:11 +08:00
yuezhihang 840b426adc 采标程度连表查询 2021-12-27 15:38:25 +08:00
yuezhihang f2d8482eeb 企标制修订计划入库 2021-12-27 15:26:15 +08:00
王夏晖 6f455ea0f1 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!325
 2021-12-27 11:15:59 +08:00
yuezhihang 78bd7e1bde 清单导出缺少数据 应该只在国家地区清单出现！已修复 2021-12-27 11:01:45 +08:00
yuezhihang b450d1486c Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-25 16:47:58 +08:00
yuezhihang c7b0affb87 计划库新增字段及逻辑 2021-12-25 16:47:50 +08:00
zhaokaiyao@91isoft.com 057ce691d6 标准导出字典转换 2021-12-25 13:40:41 +08:00
王夏晖 2c9ea4b182 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!323
 2021-12-25 09:33:39 +08:00
王夏晖 56c7b5d98e Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!322
 2021-12-25 09:33:25 +08:00
王夏晖 8c491a7dd8 Merge branch 'develop_3' into 'FOTON' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!321
 2021-12-25 09:33:08 +08:00
yuezhihang f999a8fd77 合规评估查询失效bug修复 2021-12-24 17:07:29 +08:00
zhaokaiyao@91isoft.com ea777f2c3e Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-12-24 15:23:04 +08:00
zhaokaiyao@91isoft.com d9996eeac2 预警性能 不使用转列改为使用正则 2021-12-24 15:22:37 +08:00
yuezhihang 1115c81244 未符合项查询 2021-12-24 11:12:04 +08:00
王夏晖 afc6ab860c Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!320
 2021-12-24 10:31:02 +08:00
yuezhihang c29a0070df Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-24 09:50:03 +08:00
yuezhihang 93d6af7d66 会议信息修改bug修复 2021-12-24 09:49:52 +08:00
yuezhihang b33c643622 未符合项基础模块-->历史数据查询失效bug修复 2021-12-24 09:49:21 +08:00