Merge branch 'inport0608' into test

src/components/basicKnow/BasicTermsMaintenance.vue

@@ -247,7 +247,7 @@ export default {
                   .catch(() => {});
               } else {
                 that
-                  .$alert(`${code.msg}`, "提示2", {
+                  .$alert(`${code.msg}`, "提示", {
                     confirmButtonText: "确定",
                     type: "warning"
                   })