Merge branch '03/03GRADE' into test

src/views/categroyManager/modals/payInfo.vue

@@ -246,15 +246,16 @@
         </el-row>
       </div>
       <el-row>
+        <!--  {
+              pattern: /^100$|^(\d|[1-9]\d)(\.\d{1,8})*$/,
+              message: '请输入正确的折扣',
+            } -->
         <el-form-item
           prop="discount"
           label="折扣值"
           :rules="[
             { required: true, message: '请输入折扣值', trigger: 'blur' },
-            {
-              pattern: /^100$|^(\d|[1-9]\d)(\.\d{1,8})*$/,
-              message: '请输入正确的折扣',
-            },
+
           ]"
         >
           <el-input