Commit Graph
1262 Commits
Author SHA1 Message Date
yuezhihang c260cd5533 清单查询数据报错bug修复 2021-11-18 16:17:27 +08:00
yuezhihang 7485c04801 下载程序异常 2021-11-18 15:52:03 +08:00
yuezhihang 96c6202d61 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-11-18 10:23:39 +08:00
super_liu 925512269f Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!239
2021-11-17 17:26:31 +08:00
Superman_Main c221064c4c feat: There is no way the, 2021-11-17 17:25:28 +08:00
super_liu 7fd4315ad5 Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!238
2021-11-17 15:25:31 +08:00
Superman_Main 6aa402fbce feat: There is no way the, 2021-11-17 15:24:15 +08:00
Superman_Main a7c502b0fe feat: There is no way the, 2021-11-17 15:09:10 +08:00
yuezhihang f1175010f7 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-11-17 14:04:00 +08:00
yuezhihang 216a437e9e Merge remote-tracking branch 'origin/origin/Three' into develop_master 2021-11-17 14:03:48 +08:00
super_liu 0d324cc6ae Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!237
2021-11-17 12:00:19 +08:00
Superman_Main 464451ab82 feat: There is no way the, 2021-11-17 11:56:23 +08:00
yuezhihang 478cdd4c87 新流程的Key 2021-11-16 16:59:23 +08:00
liao 11baf7eda5 ~ 2021-11-16 14:27:54 +08:00
Kevin a5d0745aa0 zcr:数据信息统计表 2021-11-16 09:17:06 +08:00
liao 303640aa27 ~ 2021-11-15 14:35:40 +08:00
liao a15f3f4934 ~ 2021-11-15 13:36:58 +08:00
super_liu 332f226fbc Merge branch 'develop_3' into 'develop_master'
Develop 3

See merge request LiuChao/foton-slrs-system-rest!236
2021-11-15 10:04:14 +08:00
Kevin 690504bddd zcr:数据信息统计表 2021-11-15 10:01:54 +08:00
zhaokaiyao@91isoft.com 3fee0547a4 标准excel导入 2021-11-15 09:59:24 +08:00
zhaokaiyao@91isoft.com 6d80822d59 重点问题跟踪 2021-11-15 09:57:42 +08:00
super_liu 262f1b198d Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, convert

See merge request LiuChao/foton-slrs-system-rest!235
2021-11-14 17:27:23 +08:00
super_liu 21acca5bee feat: There is no way the, convert 2021-11-14 17:25:47 +08:00
zhaokaiyao@91isoft.com 479e74ab6f 企标excel处理 2021-11-14 09:22:09 +08:00
super_liu a8b62fb495 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!234
2021-11-13 23:12:47 +08:00
super_liu d39aabd835 feat: There is no way the, 2021-11-13 23:12:10 +08:00
super_liu b64fb31265 Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!233
2021-11-13 22:42:56 +08:00
super_liu 7d1c79a195 Merge branch 'develop_master' into develop_migration 2021-11-13 22:39:15 +08:00
super_liu 01568460ca feat: There is no way the, 2021-11-13 22:37:24 +08:00
yuezhihang 5fb6bd278a Merge remote-tracking branch 'origin/origin/Three' into develop_master 2021-11-13 10:17:02 +08:00
王夏晖 27bf478f35 Merge branch 'develop_3' into 'develop_master'
匹配文件id和文件路径

See merge request LiuChao/foton-slrs-system-rest!232
2021-11-13 09:36:03 +08:00
zhaokaiyao@91isoft.com 308baa5d67 匹配文件id和文件路径 2021-11-12 21:30:41 +08:00
super_liu 82160c5488 Merge branch 'develop_3' into 'develop_master'
Develop 3

See merge request LiuChao/foton-slrs-system-rest!231
2021-11-12 16:00:38 +08:00
zhaokaiyao@91isoft.com 1f74918c7f 从excel中分解标准号 2021-11-12 15:59:17 +08:00
zhaokaiyao@91isoft.com 7d8e716ea2 事业部重点问题导出 2021-11-12 15:58:41 +08:00
zhaokaiyao@91isoft.com febe125ea2 excel标准对比类 2021-11-12 15:58:10 +08:00
super_liu 8c6a7aba27 Merge branch 'develop_3' into 'develop_master'
Develop 3

See merge request LiuChao/foton-slrs-system-rest!230
2021-11-12 13:50:43 +08:00
yuezhihang 5363b35153 标准政策 新增去除重复 2021-11-12 10:27:43 +08:00
zhaokaiyao@91isoft.com 5a07c4a616 对比excel数据 2021-11-12 10:12:16 +08:00
zhaokaiyao@91isoft.com e80a05a0f8 重点问题产品规划部关闭接口 2021-11-12 10:11:27 +08:00
zhaokaiyao@91isoft.com a76a135e88 重点问题事业部导出和关闭接口 2021-11-12 10:10:07 +08:00
yuezhihang 7258ce26cf Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-11-12 09:28:00 +08:00
yuezhihang 0158e29009 工作组查询 修改 2021-11-12 09:27:49 +08:00
Kevin da9e23196e zcr:日历--标准化活动日程 2021-11-11 16:17:31 +08:00
super_liu f3b7c45adf Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, tree

See merge request LiuChao/foton-slrs-system-rest!229
2021-11-11 15:46:09 +08:00
super_liu f23104f625 feat: There is no way the, tree 2021-11-11 15:45:32 +08:00
zhaokaiyao@91isoft.com d6ef4b4d2f 对比excel和数据库中的数据通过标准号 2021-11-11 15:39:24 +08:00
zhaokaiyao@91isoft.com f17cd2c975 对比excel和数据库中的数据 2021-11-11 15:15:56 +08:00
yuezhihang b714156172 工作组查询优化 2021-11-11 14:13:11 +08:00
super_liu fe1cfde5e4 Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!228
2021-11-11 13:48:20 +08:00