Merge remote-tracking branch 'origin/main'

fuintAdmin/src/views/EventMarketing/liJianMarketing/index.vue

@@ -151,7 +151,7 @@
             <el-form-item label="可使用支付方式" prop="paymentType">
               <el-checkbox-group v-model="ruleForm.paymentType">
                 <el-checkbox
-                  v-for="dict in dict.type.payment_type"
+                  v-for="dict in dict.type.pay_type"
                   v-if="dict.value!='APPLET_CODE'"
                   :key="dict.value"
                   :label="dict.value"
@@ -348,7 +348,7 @@ import {addActiveSubPrice, editActiveSubPrice, getActiveSubPrice} from "@/api/Ev
 
 export default {
   name: "LiJianMarketing",
-  dicts: ['payment_type'],
+  dicts: ['pay_type'],
   props: ['activeId'],
   data() {
     return {