Merge branch '03/03GRADE' into test

src/views/categroyManager/modals/payInfo.vue

@@ -251,6 +251,7 @@
           label="折扣值"
           :rules="[
             { required: true, message: '请输入折扣值', trigger: 'blur' },
+            { pattern:/^(?:[1-9]?\d|100)$/, message: '请输入正确的则扣' }
           ]"
         >
           <el-input