Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary

杨磊

2024-06-12 71e6a0857c5f411b8b8df3df4102cc32e7d32ba1

 src/pages/forgetPass/forgetPass.vue

@@ -54,7 +54,7 @@
          :rules="rules"
          :model="resetDataPass"
        >
          <el-form-item label="手机/邮箱" prop="cellphoneORmailbox">
          <el-form-item label="手机号/邮箱" prop="cellphoneORmailbox">
            <el-input v-model="resetDataPass.cellphoneORmailbox"></el-input>
          </el-form-item>
          <el-form-item label="验证码" prop="verifyCode">
@@ -200,7 +200,7 @@
        cellphoneORmailbox: [
          {
            required: true,
            message: "请输入手机号",
            message: "请输入手机号/邮箱",
            trigger: "blur"
          },
          {