FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,244 Commits 1 Branch 0 Tags
332f226fbc8676fa2f5c23623bfb8ef644ef9e6d
Commit Graph
1244 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
super_liu bffba63003 feat: There is no way the, 2021-11-11 13:46:28 +08:00
super_liu 4471f704ad feat: There is no way the, 2021-11-11 13:45:27 +08:00
super_liu c7ceaebef7 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!227
 2021-11-11 13:06:36 +08:00
super_liu 24df6ba025 feat: There is no way the, 2021-11-11 13:05:39 +08:00
super_liu 4b9b44f050 feat: There is no way the, 2021-11-11 12:47:45 +08:00
yuezhihang 333143549f 拆分查看页，导出程序异常白名单加入 工作组编辑 2021-11-10 15:52:43 +08:00
Kevin b74db49da3 Merge remote-tracking branch 'origin/develop_master' into origin/Three 2021-11-10 14:13:12 +08:00
yuezhihang 139911ff51 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-11-10 13:52:50 +08:00
yuezhihang 2dcb38a066 数据库时间差问题修改 2021-11-10 13:52:36 +08:00
super_liu d6432e2746 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!226
 2021-11-10 13:16:27 +08:00
super_liu c333bd9e3e feat: There is no way the, 2021-11-10 12:57:30 +08:00
zhaokaiyao@91isoft.com 78b3ed605d 重点问题项管控模块-事业部接口 2021-11-10 09:58:38 +08:00
yuezhihang 6dedfa9ea4 工作组 新增方法 2021-11-10 09:32:22 +08:00
yuezhihang 80a6df7ef6 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-11-09 14:21:00 +08:00
yuezhihang c4a26fa385 清单下拉填充bug修复 2021-11-09 14:20:44 +08:00
super_liu ea7a3bc365 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!225
 2021-11-09 12:27:16 +08:00
super_liu 9f36cb53d7 feat: There is no way the, 2021-11-09 12:26:15 +08:00
super_liu def632b24d Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, elasticsearch

See merge request LiuChao/foton-slrs-system-rest!224
 2021-11-09 10:24:11 +08:00