Merge branch 'master' of https://git.yunhengwang.net/zongjinlong/yunheng_wms_ui

src/views/system/tenant/columns.ts

@@ -25,9 +25,13 @@ export const columns = [
     width: 160,
   },
   {
-    label: '人数',
+    label: '用户限额',
     prop: 'number',
   },
+  {
+    label: '租户人数',
+    prop: 'userNum',
+  },
   {
     label: '到期时间',
     prop: 'expireTime',

src/views/system/tenant/edit.vue

@@ -38,9 +38,9 @@
         :rules="{ required: true, message: '请输入官网地址', trigger: 'blur'}">
           <el-input v-model="formData.contactSite" placeholder="请输入官网地址" clearable />
         </el-form-item>
-        <el-form-item label="用户数量" prop="number" class="flex-1"
-        :rules="{ required: true, message: '请输入用户数量', trigger: 'blur'}">
-          <number-input v-model="formData.number" placeholder="请输入用户数量" clearable />
+        <el-form-item label="用户限额" prop="number" class="flex-1"
+        :rules="{ required: true, message: '请输入用户限额', trigger: 'blur'}">
+          <number-input v-model="formData.number" placeholder="请输入用户限额" clearable />
         </el-form-item>
       </div>
       <div class="flex">