Merge remote-tracking branch 'yudao/dev' into dev-new

# Conflicts: # apps/web-antd/src/views/infra/demo/demo01/index.vue # apps/web-antd/src/views/infra/demo/general/demo01/index.vue # apps/web-antd/src/views/infra/demo/general/demo03/erp/index.vue # apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-course-list.vue # apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-list.vue # apps/web-antd/src/views/infra/demo/general/demo03/inner/index.vue # apps/web-antd/src/views/infra/demo/general/demo03/normal/index.vue
2025-05-20 17:56:53 +08:00
parent b2411ea8f5 7a54f7767a
commit 495aa10695
41 changed files with 866 additions and 1069 deletions
--- a/apps/web-antd/src/views/infra/demo/general/demo01/modules/form.vue
+++ b/apps/web-antd/src/views/infra/demo/general/demo01/modules/form.vue
@@ -119,7 +119,7 @@ const [Modal, modalApi] = useVbenModal({
        <RadioGroup v-model:value="formData.sex">
          <Radio
            v-for="dict in getDictOptions(DICT_TYPE.SYSTEM_USER_SEX, 'number')"
-            :key="dict.value"
+            :key="dict.value.toString()"
            :value="dict.value"
          >
            {{ dict.label }}