Merge tag 'Hotfix-mo-160' into develop

Finish Hotfix-mo-160

src/views/sales_policy/components/editPolicy.vue

@@ -53,6 +53,15 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+
+              <el-col :xs="24" :ms="12" :lg="12">
+                <el-form-item label="" prop="type">
+                  <div style="height: 30px">
+                    <el-checkbox v-model="searchForm.isFullRebate">返利使用金额需满额使用</el-checkbox>
+                  </div>
+                </el-form-item>
+              </el-col>
+
               <!-- <el-col :xs="24" :ms="12" :lg="12">
                 <el-form-item label="产品类别" prop="mainId">
                   <el-select
@@ -543,7 +552,8 @@ export default {
         title: '',
         mainId: '',
         mainName: '',
-        type: ''
+        type: '',
+        isFullRebate: false,
       },
       conditName:'',
       dataList: [],