解决冲突

liuyg

2021-09-06 c263633394b00cc13231f532257cef520c1b3bcb

 src/page/login/codelogin.vue

@@ -132,7 +132,6 @@
      dicr: [],
      msgKey: false,
      loginForm: {
        defaultFlag: false,
        cardid: "",
        username: "",
        sname: "",