Merge remote-tracking branch 'origin/score_shop' into score_shop

935090232@qq.com

2021-11-21 b4fa5c2efd4f78f2623f4302509b12c98a73b339

 zq-erp/src/main/resources/templates/views/admin/shop/logisticsImport-form.html

@@ -105,6 +105,8 @@
                    title: '导入快递单,部分失败',
                    content: data.info
                });
                var url = basePath + "/admin/shopOrder/exportLogisticsImportExcel";
                window.open(url);
                parent.myGrid.serchData();
            }
            $("#showFileName").val('');