Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev

# Conflicts: # src/views/mall/promotion/rewardActivity/RewardForm.vue
2025-08-14 01:51:53 +08:00 · 2024-08-23 09:08:16 +08:00
parent f11df67441 0f420bf39b
commit 814f9ba9c6
114 changed files with 311 additions and 291 deletions
--- a/src/views/pay/wallet/rechargePackage/WalletRechargePackageForm.vue
+++ b/src/views/pay/wallet/rechargePackage/WalletRechargePackageForm.vue
@@ -21,7 +21,7 @@
          <el-radio
            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
            :key="dict.value"
-            :label="dict.value"
+            :value="dict.value"
          >
            {{ dict.label }}
          </el-radio>