Merge branch 'master' of http://test.siger-data.com:9000/jiawei.su/Laisi_AutoMES2

Html/src/view/fms/associate/assemblyInfo.vue

@@ -254,7 +254,7 @@ export default {
             //导入方法
             action:
                 this.axios.publicPath +
-                "wms/Upload/Submit?templateName=StorageLocation",
+                "acc/Upload/Submit?templateName=FixtureToolsAssmeblyTemplate",
             headers: {
                 token: localStorage.getItem("token"),
                 timestamp: localStorage.getItem("timestamp"),