Merge branch 'dev_vite' of http://18.167.251.121:10003/aidlab/aida_front into dev_vite

src/component/Administrator/subscriptionPlan.vue

@@ -527,6 +527,14 @@ const columns = [
     width: 120,
     ellipsis: true
   },
+  {
+    title: 'Country or Region',
+    dataIndex: 'countryOrRegion',
+    key: 'countryOrRegion',
+    align: 'center',
+    width: 120,
+    ellipsis: true
+  },
   {
     title: 'Start Time',
     dataIndex: 'currentPeriodStart',
@@ -649,6 +657,7 @@ const openEdit = (record: SubscriptionPlan) => {
   formState.accountNum = (record as any).accountNum || null
   formState.status = record.status
   formState.id = record.id
+  formState.countryOrRegion = (record as any).countryOrRegion || null
 
   // 检查组织ID是否在已加载的组织列表中，如果不在，则添加临时项
   if (record.organizationId) {