Merge remote-tracking branch 'origin/main' into multi-tenant

2024-07-06 15:54:53 +08:00
parent ca8a4128fb 6102972373
commit f89ba87fef
18 changed files with 75 additions and 51 deletions
--- a/src/views/neUser/sub/index.vue
+++ b/src/views/neUser/sub/index.vue
@@ -1314,7 +1314,7 @@ onMounted(() => {
            <a-form-item :label="t('views.neUser.sub.neType')" name="neId ">
              <a-select
                v-model:value="queryParams.neId"
-                :options="dict.udmSubCNType"
+                :options="neOtions"
                :placeholder="t('common.selectPlease')"
              />
            </a-form-item>