Merge branch 'inport0608' into test

src/components/basicKnow/BasicTermsMaintenance.vue

@@ -239,7 +239,7 @@ export default {
               const code = JSON.parse(this.result);
               if (code.code === "00000001") {
                 that
-                  .$alert(`数据存在异常，导入失败，请修改后再试`, "提示1", {
+                  .$alert(`数据存在异常，导入失败，请修改后再试`, "提示", {
                     confirmButtonText: "确定",
                     type: "warning"
                   })