Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/page/login/userlogin.vue

@@ -88,6 +88,14 @@
        newPassword: '',
        newPassword1: '',
      },
      loginRules:{
        username:[
          { required: true, message: '请输入账号', trigger: 'blur' }
        ],
        password: [
          { required: true, message: '请输入密码', trigger: 'blur' }
        ],
      },
      rules: {
        oldPassword: [
          { required: true, message: '请输入原密码', trigger: 'blur' }

 Source/UBCS-WEB/src/views/docking/infoForm.vue

@@ -28,7 +28,7 @@
            </el-option>
          </el-select>
        </el-form-item>
        <div v-if="formData.dataFlowType=='push'">
        <div v-if="formData.pushType !='5' && formData.pushType !='6'">
          <el-form-item  label="分类选择" prop="classifyName">
            <vciWebRefer
              :referConfig="{