Merge remote-tracking branch 'origin/new' into tempMaster

src/components/Login.vue

@@ -69,7 +69,7 @@ export default {
       submit: false,
       show: false,
       type: "101",
-      name: "身份证",
+      name: "身份证号",
       patName:'',
       value: "",
       message:{