diff --git a/yudao-ui-admin-vben-master/src/api/system/enterprise/index.ts b/yudao-ui-admin-vben-master/src/api/system/enterprise/index.ts
new file mode 100644
index 0000000..af8ddbe
--- /dev/null
+++ b/yudao-ui-admin-vben-master/src/api/system/enterprise/index.ts
@@ -0,0 +1,31 @@
+import { defHttp } from '@/utils/http/axios'
+
+// 查询企业信息列表
+export function getEnterprisePage(params) {
+    return defHttp.get({ url: '/system/enterprise/page', params })
+}
+
+// 查询企业信息详情
+export function getEnterprise(id: number) {
+    return defHttp.get({ url: '/system/enterprise/get?id=' + id })
+}
+
+// 新增企业信息
+export function createEnterprise(data) {
+    return defHttp.post({ url: '/system/enterprise/create', data })
+}
+
+// 修改企业信息
+export function updateEnterprise(data) {
+    return defHttp.put({ url: '/system/enterprise/update', data })
+}
+
+// 删除企业信息
+export function deleteEnterprise(id: number) {
+    return defHttp.delete({ url: '/system/enterprise/delete?id=' + id })
+}
+
+// 导出企业信息 Excel
+export function exportEnterprise(params) {
+    return defHttp.download({ url: '/system/enterprise/export-excel', params }, '企业信息.xls')
+}
diff --git a/yudao-ui-admin-vben-master/src/api/xxjj/businessWarehouse/index.ts b/yudao-ui-admin-vben-master/src/api/xxjj/businessWarehouse/index.ts
index b0f89e5..f77ab45 100644
--- a/yudao-ui-admin-vben-master/src/api/xxjj/businessWarehouse/index.ts
+++ b/yudao-ui-admin-vben-master/src/api/xxjj/businessWarehouse/index.ts
@@ -2,27 +2,27 @@ import { defHttp } from '@/utils/http/axios'
 
 // 查询业务线/仓库列表
 export function getBusinessWarehousePage(params) {
-    return defHttp.get({ url: '/xxjj/business-warehouse/page', params })
+    return defHttp.get({ url: '/system/business-warehouse/page', params })
 }
 
 // 查询业务线/仓库详情
 export function getBusinessWarehouse(id: number) {
-    return defHttp.get({ url: '/xxjj/business-warehouse/get?id=' + id })
+    return defHttp.get({ url: '/system/business-warehouse/get?id=' + id })
 }
 
 // 新增业务线/仓库
 export function createBusinessWarehouse(data) {
-    return defHttp.post({ url: '/xxjj/business-warehouse/create', data })
+    return defHttp.post({ url: '/system/business-warehouse/create', data })
 }
 
 // 修改业务线/仓库
 export function updateBusinessWarehouse(data) {
-    return defHttp.put({ url: '/xxjj/business-warehouse/update', data })
+    return defHttp.put({ url: '/system/business-warehouse/update', data })
 }
 
 // 删除业务线/仓库
 export function deleteBusinessWarehouse(id: number) {
-    return defHttp.delete({ url: '/xxjj/business-warehouse/delete?id=' + id })
+    return defHttp.delete({ url: '/system/business-warehouse/delete?id=' + id })
 }
 
 // 导出业务线/仓库 Excel
diff --git a/yudao-ui-admin-vben-master/src/utils/dict.ts b/yudao-ui-admin-vben-master/src/utils/dict.ts
index 7ebce2f..79aaa0f 100644
--- a/yudao-ui-admin-vben-master/src/utils/dict.ts
+++ b/yudao-ui-admin-vben-master/src/utils/dict.ts
@@ -156,4 +156,9 @@ export enum DICT_TYPE {
   // ============= BUSINESSLINE 模块=================
   BUSINESS_TYPE = 'business_type',   //业务线类型
   DIFF_FLAG = 'diff_flag',
+
+  // ============= ENTERPRISEBRANCHING 模块=================
+  ENTERPRISE_TYPE = 'enterprise_type',   //业务线类型
+  CLASS_STATUS = 'class_status',
+
 }
diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/businessWarehouse.data.ts b/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/businessWarehouse.data.ts
index 75844d3..1e2ea6d 100644
--- a/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/businessWarehouse.data.ts
+++ b/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/businessWarehouse.data.ts
@@ -2,59 +2,11 @@ import { BasicColumn, FormSchema, useRender } from '@/components/Table'
 import { DICT_TYPE, getDictOptions } from '@/utils/dict'
 
 export const columns: BasicColumn[] = [
-  {
-    title: '业务id',
-    dataIndex: 'id',
-    width: 160
-  },
-  {
-    title: '业务线编号',
-    dataIndex: 'businessCode',
-    width: 160
-  },
-  {
-    title: '业务线简称',
-    dataIndex: 'businessSimple',
-    width: 160
-  },
-  {
-    title: '传真',
-    dataIndex: 'fax',
-    width: 160
-  },
-  {
-    title: '网址',
-    dataIndex: 'url',
-    width: 160
-  },
-  {
-    title: '介绍',
-    dataIndex: 'description',
-    width: 160
-  },
-  {
-    title: '创建时间',
-    dataIndex: 'createTime',
-    width: 180,
-    customRender: ({ text }) => {
-      return useRender.renderDate(text)
-    }
-  },
   {
     title: '业务线名称',
     dataIndex: 'name',
     width: 160
   },
-  {
-    title: '业务线LOGO',
-    dataIndex: 'businessLogo',
-    width: 160
-  },
-  {
-    title: '父id',
-    dataIndex: 'parentId',
-    width: 160
-  },
   {
     title: '类型',
     dataIndex: 'type',
@@ -64,87 +16,44 @@ export const columns: BasicColumn[] = [
     }
   },
   {
-    title: '所属行业',
-    dataIndex: 'industry',
+    title: '状态',
+    dataIndex: 'type',
     width: 180,
     customRender: ({ text }) => {
-      return useRender.renderDict(text, DICT_TYPE.DUTY_TYPE)
+      return useRender.renderDict(text, DICT_TYPE.CLASS_STATUS)
     }
   },
   {
-    title: '所在城市',
-    dataIndex: 'city',
+    title: '关联机构',
+    dataIndex: 'institutionNum',
     width: 160
   },
   {
-    title: '成立时间',
-    dataIndex: 'establishDate',
-    width: 180,
-    customRender: ({ text }) => {
-      return useRender.renderDate(text)
-    }
-  },
-  {
-    title: '归属人员',
-    dataIndex: 'belongUserId',
+    title: '成员数量',
+    dataIndex: 'employeeNum',
     width: 160
   },
   {
-    title: '品牌/业务线/事业群名称',
-    dataIndex: 'brandName',
+    title: '主管人员',
+    dataIndex: 'belongUserId',
     width: 160
   },
   {
-    title: '电话',
-    dataIndex: 'phone',
+    title: '介绍',
+    dataIndex: 'description',
     width: 160
   },
   {
-    title: '业务线仓库区分(0：业务线,1：仓库)',
-    dataIndex: 'diffFlag',
+    title: '更新时间',
+    dataIndex: 'updateTime',
     width: 180,
     customRender: ({ text }) => {
-      return useRender.renderDict(text, DICT_TYPE.DIFF_FLAG)
+      return useRender.renderDate(text)
     }
   },
 ]
 
 export const searchFormSchema: FormSchema[] = [
-  // {
-  //   label: '业务线编号',
-  //   field: 'businessCode',
-  //   component: 'Input',
-  //   colProps: { span: 8 }
-  // },
-  // {
-  //   label: '业务线简称',
-  //   field: 'businessSimple',
-  //   component: 'Input',
-  //   colProps: { span: 8 }
-  // },
-  // {
-  //   label: '传真',
-  //   field: 'fax',
-  //   component: 'Input',
-  //   colProps: { span: 8 }
-  // },
-  // {
-  //   label: '网址',
-  //   field: 'url',
-  //   component: 'Input',
-  //   colProps: { span: 8 }
-  // },
-  // {
-  //   label: '介绍',
-  //   field: 'description',
-  //   colProps: { span: 8 }
-  // },
-  // {
-  //   label: '创建时间',
-  //   field: 'createTime',
-  //   component: 'RangePicker',
-  //   colProps: { span: 8 }
-  // },
   {
     label: '业务线名称',
     field: 'name',
@@ -152,18 +61,6 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 8 }
   },
   // {
-  //   label: '业务线LOGO',
-  //   field: 'businessLogo',
-  //   component: 'Input',
-  //   colProps: { span: 8 }
-  // },
-  // {
-  //   label: '父id',
-  //   field: 'parentId',
-  //   component: 'Input',
-  //   colProps: { span: 8 }
-  // },
-  // {
   //   label: '类型',
   //   field: 'type',
   //   component: 'Select',
@@ -182,12 +79,6 @@ export const searchFormSchema: FormSchema[] = [
   //   colProps: { span: 8 }
   // },
   // {
-  //   label: '所在城市',
-  //   field: 'city',
-  //   component: 'Input',
-  //   colProps: { span: 8 }
-  // },
-  // {
   //   label: '成立时间',
   //   field: 'establishDate',
   //   component: 'RangePicker',
@@ -206,12 +97,6 @@ export const searchFormSchema: FormSchema[] = [
   //   colProps: { span: 8 }
   // },
   // {
-  //   label: '电话',
-  //   field: 'phone',
-  //   component: 'Input',
-  //   colProps: { span: 8 }
-  // },
-  // {
   //   label: '业务线仓库区分(0：业务线,1：仓库)',
   //   field: 'diffFlag',
   //   component: 'Select',
@@ -264,7 +149,11 @@ export const createFormSchema: FormSchema[] = [
   {
     label: '业务线LOGO',
     field: 'businessLogo',
-    component: 'Input'
+    component: 'FileUpload',
+    componentProps: {
+      fileType: 'file',
+      maxCount: 1
+    }
   },
   {
     label: '父id',
@@ -341,21 +230,6 @@ export const updateFormSchema: FormSchema[] = [
     field: 'businessSimple',
     component: 'Input'
   },
-  {
-    label: '传真',
-    field: 'fax',
-    component: 'Input'
-  },
-  {
-    label: '网址',
-    field: 'url',
-    component: 'Input'
-  },
-  {
-    label: '介绍',
-    field: 'description',
-    component: 'InputTextArea'
-  },
   {
     label: '业务线名称',
     field: 'name',
@@ -365,7 +239,7 @@ export const updateFormSchema: FormSchema[] = [
   {
     label: '业务线LOGO',
     field: 'businessLogo',
-    component: 'Input'
+    component: 'Upload'
   },
   {
     label: '父id',
@@ -413,6 +287,21 @@ export const updateFormSchema: FormSchema[] = [
     field: 'phone',
     component: 'Input'
   },
+  {
+    label: '传真',
+    field: 'fax',
+    component: 'Input'
+  },
+  {
+    label: '网址',
+    field: 'url',
+    component: 'Input'
+  },
+  {
+    label: '介绍',
+    field: 'description',
+    component: 'InputTextArea'
+  },
   {
     label: '业务线仓库区分(0：业务线,1：仓库)',
     field: 'diffFlag',
diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/EnterpriseModal.vue b/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/EnterpriseModal.vue
new file mode 100644
index 0000000..6d02582
--- /dev/null
+++ b/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/EnterpriseModal.vue
@@ -0,0 +1,57 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="isUpdate ? t('action.edit') : t('action.create')" @ok="handleSubmit">
+    <BasicForm @register="registerForm" />
+  </BasicModal>
+</template>
+<script lang="ts" setup>
+import { ref, unref } from 'vue'
+import { useI18n } from '@/hooks/web/useI18n'
+import { useMessage } from '@/hooks/web/useMessage'
+import { BasicForm, useForm } from '@/components/Form'
+import { BasicModal, useModalInner } from '@/components/Modal'
+import { createFormSchema, updateFormSchema } from './enterprise.data'
+import { createEnterprise, getEnterprise, updateEnterprise } from '@/api/system/enterprise'
+
+defineOptions({ name: 'EnterpriseModal' })
+
+const { t } = useI18n()
+const { createMessage } = useMessage()
+const emit = defineEmits(['success', 'register'])
+const isUpdate = ref(true)
+
+const [registerForm, { setFieldsValue, resetFields, resetSchema, validate }] = useForm({
+  labelWidth: 120,
+  baseColProps: { span: 24 },
+  schemas: createFormSchema,
+  showActionButtonGroup: false,
+  actionColOptions: { span: 23 }
+})
+
+const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+  resetFields()
+  setModalProps({ confirmLoading: false })
+  isUpdate.value = !!data?.isUpdate
+  if (unref(isUpdate)) {
+    resetSchema(updateFormSchema)
+    const res = await getEnterprise(data.record.id)
+    setFieldsValue({ ...res })
+  }
+})
+
+async function handleSubmit() {
+  try {
+    const values = await validate()
+    setModalProps({ confirmLoading: true })
+    if (unref(isUpdate)) {
+      await updateEnterprise(values)
+    } else {
+      await createEnterprise(values)
+    }
+    closeModal()
+    emit('success')
+    createMessage.success(t('common.saveSuccessText'))
+  } finally {
+    setModalProps({ confirmLoading: false })
+  }
+}
+</script>
diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/enterprise.data.ts b/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/enterprise.data.ts
new file mode 100644
index 0000000..bcbb697
--- /dev/null
+++ b/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/enterprise.data.ts
@@ -0,0 +1,814 @@
+import { BasicColumn, FormSchema, useRender } from '@/components/Table'
+import { DICT_TYPE, getDictOptions } from '@/utils/dict'
+
+export const columns: BasicColumn[] = [
+  // {
+  //   title: '编号',
+  //   dataIndex: 'id',
+  //   width: 160
+  // },
+  {
+    title: '企业名称',
+    dataIndex: 'name',
+    width: 160
+  },
+  {
+    title: '机构类型',
+    dataIndex: 'enterpriseType',
+    width: 180,
+    customRender: ({ text }) => {
+      return useRender.renderDict(text, DICT_TYPE.ENTERPRISE_TYPE)
+    }
+  },
+  {
+    title: '关联子公司(没弄)',
+    dataIndex: '',
+    width: 160
+  },
+  {
+    title: '包含业务线(没弄)',
+    dataIndex: '',
+    width: 160
+  },
+  {
+    title: '关联员工(没弄)',
+    dataIndex: '',
+    width: 160
+  },
+  {
+    title: '首联系人',
+    dataIndex: 'firstConcat',
+    width: 160
+  },
+  {
+    title: '联系电话',
+    dataIndex: 'phone',
+    width: 160
+  },
+  {
+    title: '更新时间',
+    dataIndex: 'updateTime',
+    width: 180,
+    customRender: ({ text }) => {
+      return useRender.renderDate(text)
+    }
+  },
+  // {
+  //   title: '企业简称',
+  //   dataIndex: 'shortName',
+  //   width: 160
+  // },
+  // {
+  //   title: '主体类型',
+  //   dataIndex: 'mainType',
+  //   width: 180,
+  //   customRender: ({ text }) => {
+  //     return useRender.renderDict(text, DICT_TYPE.MAIN_TYPE)
+  //   }
+  // },
+  // {
+  //   title: '企业代码',
+  //   dataIndex: 'code',
+  //   width: 160
+  // },
+  // {
+  //   title: '社会统一信息代码',
+  //   dataIndex: 'societyCode',
+  //   width: 160
+  // },
+  // {
+  //   title: '办理人(0：法人 1：代办人)',
+  //   dataIndex: 'transactors',
+  //   width: 160
+  // },
+  // {
+  //   title: '实际操作人(0：法人 1：代办人)',
+  //   dataIndex: 'operator',
+  //   width: 160
+  // },
+  // {
+  //   title: '法人证件有效期类型(0：长期 1：非长期)',
+  //   dataIndex: 'legalOperator',
+  //   width: 160
+  // },
+  // {
+  //   title: '代办人证件类型(0：身份证 1：护照)',
+  //   dataIndex: 'commissionCertificateType',
+  //   width: 160
+  // },
+  // {
+  //   title: '代办人证件有效期类型(0：长期 1：非长期)',
+  //   dataIndex: 'commissionOperator',
+  //   width: 160
+  // },
+  // {
+  //   title: '创建时间',
+  //   dataIndex: 'createTime',
+  //   width: 180,
+  //   customRender: ({ text }) => {
+  //     return useRender.renderDate(text)
+  //   }
+  // },
+  // {
+  //   title: '企业id',
+  //   dataIndex: 'parentId',
+  //   width: 160
+  // },
+
+]
+
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: '企业名称',
+    field: 'name',
+    component: 'Input',
+    colProps: { span: 8 }
+  },
+  // {
+  //   label: '主体类型',
+  //   field: 'mainType',
+  //   component: 'Select',
+  //   componentProps: {
+  //       options: getDictOptions(DICT_TYPE.MAIN_TYPE)
+  //   },
+  //   colProps: { span: 8 }
+  // },
+  // {
+  //   label: '企业代码',
+  //   field: 'code',
+  //   component: 'Input',
+  //   colProps: { span: 8 }
+  // },
+  // {
+  //   label: '社会统一信息代码',
+  //   field: 'societyCode',
+  //   component: 'Input',
+  //   colProps: { span: 8 }
+  // },
+  // {
+  //   label: '办理人(0：法人 1：代办人)',
+  //   field: 'transactors',
+  //   component: 'Input',
+  //   colProps: { span: 8 }
+  // },
+  // {
+  //   label: '实际操作人(0：法人 1：代办人)',
+  //   field: 'operator',
+  //   component: 'Input',
+  //   colProps: { span: 8 }
+  // },
+  // {
+  //   label: '法人证件有效期类型(0：长期 1：非长期)',
+  //   field: 'legalOperator',
+  //   component: 'Input',
+  //   colProps: { span: 8 }
+  // },
+  // {
+  //   label: '代办人证件类型(0：身份证 1：护照)',
+  //   field: 'commissionCertificateType',
+  //   component: 'Select',
+  //   componentProps: {
+  //       options: []
+  //   },
+  //   colProps: { span: 8 }
+  // },
+  // {
+  //   label: '代办人证件有效期类型(0：长期 1：非长期)',
+  //   field: 'commissionOperator',
+  //   component: 'Input',
+  //   colProps: { span: 8 }
+  // },
+  // {
+  //   label: '创建时间',
+  //   field: 'createTime',
+  //   component: 'RangePicker',
+  //   colProps: { span: 8 }
+  // },
+  // {
+  //   label: '企业id',
+  //   field: 'parentId',
+  //   component: 'Input',
+  //   colProps: { span: 8 }
+  // },
+  // {
+  //   label: '总公司，子公司机构类型',
+  //   field: 'enterpriseType',
+  //   component: 'Select',
+  //   componentProps: {
+  //       options: getDictOptions(DICT_TYPE.ENTERPRISE_TYPE)
+  //   },
+  //   colProps: { span: 8 }
+  // },
+]
+
+export const createFormSchema: FormSchema[] = [
+  {
+    label: '编号',
+    field: 'id',
+    show: false,
+    component: 'Input'
+  },
+  {
+    label: '企业名称',
+    field: 'name',
+    required: true,
+    component: 'Input'
+  },
+  // {
+  //   label: '企业简称',
+  //   field: 'shortName',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '主体类型',
+  //   field: 'mainType',
+  //   component: 'Select',
+  //   componentProps: {
+  //       options: getDictOptions(DICT_TYPE.MAIN_TYPE, 'number')
+  //   }
+  // },
+  // {
+  //   label: '所在城市',
+  //   field: 'city',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '行业类型',
+  //   field: 'dutyType',
+  //   component: 'Select',
+  //   componentProps: {
+  //       options: getDictOptions(DICT_TYPE.DUTY_TYPE, 'number')
+  //   }
+  // },
+  {
+    label: '首联系人',
+    field: 'firstConcat',
+    component: 'Input'
+  },
+  // {
+  //   label: '职位',
+  //   field: 'position',
+  //   component: 'Input'
+  // },
+  {
+    label: '手机号码',
+    field: 'phone',
+    component: 'Input'
+  },
+  // {
+  //   label: 'logo图片',
+  //   field: 'logo',
+  //   component: 'FileUpload',
+  //   componentProps: {
+  //     fileType: 'file',
+  //     maxCount: 1
+  //   }
+  // },
+  // {
+  //   label: '地址',
+  //   field: 'address',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '企业电话',
+  //   field: 'enterprisePhone',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '企业传真',
+  //   field: 'enterpriseFax',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '企业网址',
+  //   field: 'enterpriseWebsite',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '企业简介',
+  //   field: 'enterpriseRemark',
+  //   component: 'InputTextArea'
+  // },
+  // {
+  //   label: '税号',
+  //   field: 'dutyParagraph',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '发票抬头',
+  //   field: 'invoiceHeader',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '开户银行',
+  //   field: 'openBank',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '银行卡号',
+  //   field: 'bankAccount',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '银行电话',
+  //   field: 'bankPhone',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '注册地址',
+  //   field: 'registerAddress',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '经营开始时间',
+  //   field: 'startDate',
+  //   component: 'DatePicker'
+  // },
+  // {
+  //   label: '经营结束时间',
+  //   field: 'endDate',
+  //   component: 'DatePicker'
+  // },
+  // {
+  //   label: '证件照',
+  //   field: 'photo',
+  //   component: 'FileUpload',
+  //   componentProps: {
+  //     fileType: 'file',
+  //     maxCount: 1
+  //   }
+  // },
+  // {
+  //   label: '经营范围',
+  //   field: 'businessScope',
+  //   component: 'InputTextArea'
+  // },
+  // {
+  //   label: '邮箱',
+  //   field: 'email',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '法人证件照1',
+  //   field: 'legalPersonPhoto1',
+  //   component: 'FileUpload',
+  //   componentProps: {
+  //     fileType: 'file',
+  //     maxCount: 1
+  //   }
+  // },
+  // {
+  //   label: '法人证件照2',
+  //   field: 'legalPersonPhoto2',
+  //   component: 'FileUpload',
+  //   componentProps: {
+  //     fileType: 'file',
+  //     maxCount: 1
+  //   }
+  // },
+  // {
+  //   label: '法人证件照3',
+  //   field: 'legalPersonPhoto3',
+  //   component: 'FileUpload',
+  //   componentProps: {
+  //     fileType: 'file',
+  //     maxCount: 1
+  //   }
+  // },
+  // {
+  //   label: '法人证件类型(0：身份证 1：护照)',
+  //   field: 'legalCertificateType',
+  //   component: 'Select',
+  //   componentProps: {
+  //       options: getDictOptions(DICT_TYPE.CERTIFICATE_TYPE, 'number')
+  //   }
+  // },
+  // {
+  //   label: '法人姓名',
+  //   field: 'legalPersonName',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '法人证件号',
+  //   field: 'legalCardNo',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '法人生日',
+  //   field: 'legalBirthday',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '法人证件有效开始时间',
+  //   field: 'legalCardStart',
+  //   component: 'DatePicker'
+  // },
+  // {
+  //   label: '法人证件有效结束时间',
+  //   field: 'legalCardEnd',
+  //   component: 'DatePicker'
+  // },
+  // {
+  //   label: '代办人证件照1',
+  //   field: 'commissionPersonPhoto1',
+  //   component: 'FileUpload',
+  //   componentProps: {
+  //     fileType: 'file',
+  //     maxCount: 1
+  //   }
+  // },
+  // {
+  //   label: '代办人证件照2',
+  //   field: 'commissionPersonPhoto2',
+  //   component: 'FileUpload',
+  //   componentProps: {
+  //     fileType: 'file',
+  //     maxCount: 1
+  //   }
+  // },
+  // {
+  //   label: '代办人证件照3',
+  //   field: 'commissionPersonPhoto3',
+  //   component: 'FileUpload',
+  //   componentProps: {
+  //     fileType: 'file',
+  //     maxCount: 1
+  //   }
+  // },
+  // {
+  //   label: '代办人证件照4',
+  //   field: 'commissionPersonPhoto4',
+  //   component: 'FileUpload',
+  //   componentProps: {
+  //     fileType: 'file',
+  //     maxCount: 1
+  //   }
+  // },
+  // {
+  //   label: '代办人姓名',
+  //   field: 'commissionPersonName',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '代办人证件号',
+  //   field: 'commissionCardNo',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '代办人生日',
+  //   field: 'commissionBirthday',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '代办人证件有效开始时间',
+  //   field: 'commissionCardStart',
+  //   component: 'DatePicker'
+  // },
+  // {
+  //   label: '代办人证件有效结束时间',
+  //   field: 'commissionCardEnd',
+  //   component: 'DatePicker'
+  // },
+  {
+    label: '描述',
+    field: 'description',
+    component: 'InputTextArea'
+  },
+  // {
+  //   label: '企业代码',
+  //   field: 'code',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '社会统一信息代码',
+  //   field: 'societyCode',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '办理人(0：法人 1：代办人)',
+  //   field: 'transactors',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '实际操作人(0：法人 1：代办人)',
+  //   field: 'operator',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '法人证件有效期类型(0：长期 1：非长期)',
+  //   field: 'legalOperator',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '代办人证件类型(0：身份证 1：护照)',
+  //   field: 'commissionCertificateType',
+  //   component: 'Select',
+  //   componentProps: {
+  //       options:[]
+  //   }
+  // },
+  // {
+  //   label: '代办人证件有效期类型(0：长期 1：非长期)',
+  //   field: 'commissionOperator',
+  //   component: 'Input'
+  // },
+  {
+    label: '企业id',
+    field: 'parentId',
+    component: 'Input'
+  },
+  {
+    label: '上级机构',
+    field: 'enterpriseType',
+    component: 'Select',
+    componentProps: {
+        options: getDictOptions(DICT_TYPE.ENTERPRISE_TYPE, 'number')
+    }
+  },
+]
+
+export const updateFormSchema: FormSchema[] = [
+  // {
+  //   label: '编号',
+  //   field: 'id',
+  //   show: false,
+  //   component: 'Input'
+  // },
+  {
+    label: '企业名称',
+    field: 'name',
+    required: true,
+    component: 'Input'
+  },
+  {
+    label: '企业id',
+    field: 'parentId',
+    component: 'Input'
+  },
+  {
+    label: '首联系人',
+    field: 'firstConcat',
+    component: 'Input'
+  },
+  {
+    label: '手机号码',
+    field: 'phone',
+    component: 'Input'
+  },
+  {
+    label: '机构描述',
+    field: 'description',
+    component: 'InputTextArea'
+  },
+  // {
+  //   label: '企业简称',
+  //   field: 'shortName',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '主体类型',
+  //   field: 'mainType',
+  //   component: 'Select',
+  //   componentProps: {
+  //       options: getDictOptions(DICT_TYPE.MAIN_TYPE, 'number')
+  //   }
+  // },
+  // {
+  //   label: '所在城市',
+  //   field: 'city',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '行业类型',
+  //   field: 'dutyType',
+  //   component: 'Select',
+  //   componentProps: {
+  //       options: getDictOptions(DICT_TYPE.DUTY_TYPE, 'number')
+  //   }
+  // },
+
+  // {
+  //   label: 'logo图片',
+  //   field: 'logo',
+  //   component: 'Upload'
+  // },
+  // {
+  //   label: '地址',
+  //   field: 'address',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '企业电话',
+  //   field: 'enterprisePhone',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '企业传真',
+  //   field: 'enterpriseFax',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '企业网址',
+  //   field: 'enterpriseWebsite',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '企业简介',
+  //   field: 'enterpriseRemark',
+  //   component: 'InputTextArea'
+  // },
+  // {
+  //   label: '税号',
+  //   field: 'dutyParagraph',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '发票抬头',
+  //   field: 'invoiceHeader',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '开户银行',
+  //   field: 'openBank',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '银行卡号',
+  //   field: 'bankAccount',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '银行电话',
+  //   field: 'bankPhone',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '注册地址',
+  //   field: 'registerAddress',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '经营开始时间',
+  //   field: 'startDate',
+  //   component: 'DatePicker'
+  // },
+  // {
+  //   label: '经营结束时间',
+  //   field: 'endDate',
+  //   component: 'DatePicker'
+  // },
+  // {
+  //   label: '证件照',
+  //   field: 'photo',
+  //   component: 'Upload'
+  // },
+  // {
+  //   label: '经营范围',
+  //   field: 'businessScope',
+  //   component: 'InputTextArea'
+  // },
+  // {
+  //   label: '邮箱',
+  //   field: 'email',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '法人证件照1',
+  //   field: 'legalPersonPhoto1',
+  //   component: 'Upload'
+  // },
+  // {
+  //   label: '法人证件照2',
+  //   field: 'legalPersonPhoto2',
+  //   component: 'Upload'
+  // },
+  // {
+  //   label: '法人证件照3',
+  //   field: 'legalPersonPhoto3',
+  //   component: 'Upload'
+  // },
+  // {
+  //   label: '法人证件类型(0：身份证 1：护照)',
+  //   field: 'legalCertificateType',
+  //   component: 'Select',
+  //   componentProps: {
+  //       options: getDictOptions(DICT_TYPE.CERTIFICATE_TYPE, 'number')
+  //   }
+  // },
+  // {
+  //   label: '法人姓名',
+  //   field: 'legalPersonName',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '法人证件号',
+  //   field: 'legalCardNo',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '法人生日',
+  //   field: 'legalBirthday',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '法人证件有效开始时间',
+  //   field: 'legalCardStart',
+  //   component: 'DatePicker'
+  // },
+  // {
+  //   label: '法人证件有效结束时间',
+  //   field: 'legalCardEnd',
+  //   component: 'DatePicker'
+  // },
+  // {
+  //   label: '代办人证件照1',
+  //   field: 'commissionPersonPhoto1',
+  //   component: 'Upload'
+  // },
+  // {
+  //   label: '代办人证件照2',
+  //   field: 'commissionPersonPhoto2',
+  //   component: 'Upload'
+  // },
+  // {
+  //   label: '代办人证件照3',
+  //   field: 'commissionPersonPhoto3',
+  //   component: 'Upload'
+  // },
+  // {
+  //   label: '代办人证件照4',
+  //   field: 'commissionPersonPhoto4',
+  //   component: 'Upload'
+  // },
+  // {
+  //   label: '代办人姓名',
+  //   field: 'commissionPersonName',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '代办人证件号',
+  //   field: 'commissionCardNo',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '代办人生日',
+  //   field: 'commissionBirthday',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '代办人证件有效开始时间',
+  //   field: 'commissionCardStart',
+  //   component: 'DatePicker'
+  // },
+  // {
+  //   label: '代办人证件有效结束时间',
+  //   field: 'commissionCardEnd',
+  //   component: 'DatePicker'
+  // },
+  // {
+  //   label: '企业代码',
+  //   field: 'code',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '社会统一信息代码',
+  //   field: 'societyCode',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '办理人(0：法人 1：代办人)',
+  //   field: 'transactors',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '实际操作人(0：法人 1：代办人)',
+  //   field: 'operator',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '法人证件有效期类型(0：长期 1：非长期)',
+  //   field: 'legalOperator',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '代办人证件类型(0：身份证 1：护照)',
+  //   field: 'commissionCertificateType',
+  //   component: 'Select',
+  //   componentProps: {
+  //       options:[]
+  //   }
+  // },
+  // {
+  //   label: '代办人证件有效期类型(0：长期 1：非长期)',
+  //   field: 'commissionOperator',
+  //   component: 'Input'
+  // },
+  // {
+  //   label: '总公司，子公司机构类型',
+  //   field: 'enterpriseType',
+  //   component: 'Select',
+  //   componentProps: {
+  //       options: getDictOptions(DICT_TYPE.ENTERPRISE_TYPE, 'number')
+  //   }
+  // },
+]
diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/index.vue b/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/index.vue
new file mode 100644
index 0000000..b4ad6ba
--- /dev/null
+++ b/yudao-ui-admin-vben-master/src/views/xxjj/enterprisebranching/index.vue
@@ -0,0 +1,92 @@
+<template>
+  <div>
+    <BasicTable @register="registerTable">
+      <template #toolbar>
+        <a-button type="primary" v-auth="['system:enterprise:create']" :preIcon="IconEnum.ADD" @click="handleCreate">
+          {{ t('action.create') }}
+        </a-button>
+        <a-button type="warning" v-auth="['system:enterprise:export']" :preIcon="IconEnum.EXPORT" @click="handleExport">
+          {{ t('action.export') }}
+        </a-button>
+      </template>
+      <template #bodyCell="{ column, record }">
+        <template v-if="column.key === 'action'">
+          <TableAction
+             :actions="[
+               { icon: IconEnum.EDIT, label: t('action.edit'), auth: 'system:enterprise:update', onClick: handleEdit.bind(null, record) },
+               {
+                  icon: IconEnum.DELETE,
+                  color: 'error',
+                  label: t('action.delete'),
+                  auth: 'system:enterprise:delete',
+                  popConfirm: {
+                    title: t('common.delMessage'),
+                    placement: 'left',
+                    confirm: handleDelete.bind(null, record)
+                  }
+              }
+            ]"
+          />
+        </template>
+      </template>
+    </BasicTable>
+    <EnterpriseModal @register="registerModal" @success="reload()" />
+  </div>
+</template>
+<script lang="ts" setup>
+import { useI18n } from '@/hooks/web/useI18n'
+import { useMessage } from '@/hooks/web/useMessage'
+import { useModal } from '@/components/Modal'
+import EnterpriseModal from './EnterpriseModal.vue'
+import { IconEnum } from '@/enums/appEnum'
+import { BasicTable, useTable, TableAction } from '@/components/Table'
+import { deleteEnterprise, exportEnterprise, getEnterprisePage } from '@/api/system/enterprise'
+import { columns, searchFormSchema } from './enterprise.data'
+
+defineOptions({ name: 'Enterprise' })
+
+const { t } = useI18n()
+const { createConfirm, createMessage } = useMessage()
+const [registerModal, { openModal }] = useModal()
+
+const [registerTable, { getForm, reload }] = useTable({
+  title: '分支机构',
+  api: getEnterprisePage,
+  columns,
+  formConfig: { labelWidth: 120, schemas: searchFormSchema },
+  useSearchForm: true,
+  showTableSetting: true,
+  actionColumn: {
+    width: 140,
+    title: t('common.action'),
+    dataIndex: 'action',
+    fixed: 'right'
+  }
+})
+
+function handleCreate() {
+  openModal(true, { isUpdate: false })
+}
+
+function handleEdit(record: Recordable) {
+  openModal(true, { record, isUpdate: true })
+}
+
+async function handleExport() {
+  createConfirm({
+    title: t('common.exportTitle'),
+    iconType: 'warning',
+    content: t('common.exportMessage'),
+    async onOk() {
+      await exportEnterprise(getForm().getFieldsValue())
+      createMessage.success(t('common.exportSuccessText'))
+    }
+  })
+}
+
+async function handleDelete(record: Recordable) {
+  await deleteEnterprise(record.id)
+  createMessage.success(t('common.delSuccessText'))
+  reload()
+}
+</script>
diff --git a/yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/ErrorCodeConstants.java b/yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/ErrorCodeConstants.java
index 7af04b7..89923e7 100644
--- a/yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/ErrorCodeConstants.java
+++ b/yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/ErrorCodeConstants.java
@@ -163,4 +163,12 @@ public interface ErrorCodeConstants {
     // ========== 站内信发送 1002028000 ==========
     ErrorCode NOTIFY_SEND_TEMPLATE_PARAM_MISS = new ErrorCode(1002028000, "模板参数({})缺失");
 
+
+    // ========== 企业信息 TODO 补充编号 ==========
+    ErrorCode ENTERPRISE_NOT_EXISTS = new ErrorCode(1002004015, "企业信息不存在");
+
+    // ========== 业务线表 TODO 补充编号 ==========
+    ErrorCode BUSINESS_WAREHOUSE_NOT_EXISTS = new ErrorCode(1002025019, "业务线表不存在");
+
+
 }
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/BusinessWarehouseController.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/BusinessWarehouseController.java
similarity index 70%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/BusinessWarehouseController.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/BusinessWarehouseController.java
index abf091e..6770a6b 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/BusinessWarehouseController.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/BusinessWarehouseController.java
@@ -1,4 +1,4 @@
-package com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse;
+package com.yunxi.scm.module.system.controller.admin.businesswarehouse;
 
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -23,14 +23,14 @@ import com.yunxi.scm.framework.excel.core.util.ExcelUtils;
 import com.yunxi.scm.framework.operatelog.core.annotations.OperateLog;
 import static com.yunxi.scm.framework.operatelog.core.enums.OperateTypeEnum.*;
 
-import com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo.*;
-import com.yunxi.scm.module.xxjj.dal.dataobject.businesswarehouse.BusinessWarehouseDO;
-import com.yunxi.scm.module.xxjj.convert.businesswarehouse.BusinessWarehouseConvert;
-import com.yunxi.scm.module.xxjj.service.businesswarehouse.BusinessWarehouseService;
+import com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo.*;
+import com.yunxi.scm.module.system.dal.dataobject.businesswarehouse.BusinessWarehouseDO;
+import com.yunxi.scm.module.system.convert.businesswarehouse.BusinessWarehouseConvert;
+import com.yunxi.scm.module.system.service.businesswarehouse.BusinessWarehouseService;
 
-@Tag(name = "管理后台 - 业务线/仓库")
+@Tag(name = "管理后台 - 业务线表")
 @RestController
-@RequestMapping("/xxjj/business-warehouse")
+@RequestMapping("/system/business-warehouse")
 @Validated
 public class BusinessWarehouseController {
 
@@ -38,65 +38,65 @@ public class BusinessWarehouseController {
     private BusinessWarehouseService businessWarehouseService;
 
     @PostMapping("/create")
-    @Operation(summary = "创建业务线/仓库")
-    @PreAuthorize("@ss.hasPermission('xxjj:business-warehouse:create')")
+    @Operation(summary = "创建业务线表")
+    @PreAuthorize("@ss.hasPermission('system:business-warehouse:create')")
     public CommonResult<Long> createBusinessWarehouse(@Valid @RequestBody BusinessWarehouseCreateReqVO createReqVO) {
         return success(businessWarehouseService.createBusinessWarehouse(createReqVO));
     }
 
     @PutMapping("/update")
-    @Operation(summary = "更新业务线/仓库")
-    @PreAuthorize("@ss.hasPermission('xxjj:business-warehouse:update')")
+    @Operation(summary = "更新业务线表")
+    @PreAuthorize("@ss.hasPermission('system:business-warehouse:update')")
     public CommonResult<Boolean> updateBusinessWarehouse(@Valid @RequestBody BusinessWarehouseUpdateReqVO updateReqVO) {
         businessWarehouseService.updateBusinessWarehouse(updateReqVO);
         return success(true);
     }
 
     @DeleteMapping("/delete")
-    @Operation(summary = "删除业务线/仓库")
+    @Operation(summary = "删除业务线表")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('xxjj:business-warehouse:delete')")
+    @PreAuthorize("@ss.hasPermission('system:business-warehouse:delete')")
     public CommonResult<Boolean> deleteBusinessWarehouse(@RequestParam("id") Long id) {
         businessWarehouseService.deleteBusinessWarehouse(id);
         return success(true);
     }
 
     @GetMapping("/get")
-    @Operation(summary = "获得业务线/仓库")
+    @Operation(summary = "获得业务线表")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('xxjj:business-warehouse:query')")
+    @PreAuthorize("@ss.hasPermission('system:business-warehouse:query')")
     public CommonResult<BusinessWarehouseRespVO> getBusinessWarehouse(@RequestParam("id") Long id) {
         BusinessWarehouseDO businessWarehouse = businessWarehouseService.getBusinessWarehouse(id);
         return success(BusinessWarehouseConvert.INSTANCE.convert(businessWarehouse));
     }
 
     @GetMapping("/list")
-    @Operation(summary = "获得业务线/仓库列表")
+    @Operation(summary = "获得业务线表列表")
     @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
-    @PreAuthorize("@ss.hasPermission('xxjj:business-warehouse:query')")
+    @PreAuthorize("@ss.hasPermission('system:business-warehouse:query')")
     public CommonResult<List<BusinessWarehouseRespVO>> getBusinessWarehouseList(@RequestParam("ids") Collection<Long> ids) {
         List<BusinessWarehouseDO> list = businessWarehouseService.getBusinessWarehouseList(ids);
         return success(BusinessWarehouseConvert.INSTANCE.convertList(list));
     }
 
     @GetMapping("/page")
-    @Operation(summary = "获得业务线/仓库分页")
-    @PreAuthorize("@ss.hasPermission('xxjj:business-warehouse:query')")
+    @Operation(summary = "获得业务线表分页")
+    @PreAuthorize("@ss.hasPermission('system:business-warehouse:query')")
     public CommonResult<PageResult<BusinessWarehouseRespVO>> getBusinessWarehousePage(@Valid BusinessWarehousePageReqVO pageVO) {
         PageResult<BusinessWarehouseDO> pageResult = businessWarehouseService.getBusinessWarehousePage(pageVO);
         return success(BusinessWarehouseConvert.INSTANCE.convertPage(pageResult));
     }
 
     @GetMapping("/export-excel")
-    @Operation(summary = "导出业务线/仓库 Excel")
-    @PreAuthorize("@ss.hasPermission('xxjj:business-warehouse:export')")
+    @Operation(summary = "导出业务线表 Excel")
+    @PreAuthorize("@ss.hasPermission('system:business-warehouse:export')")
     @OperateLog(type = EXPORT)
     public void exportBusinessWarehouseExcel(@Valid BusinessWarehouseExportReqVO exportReqVO,
               HttpServletResponse response) throws IOException {
         List<BusinessWarehouseDO> list = businessWarehouseService.getBusinessWarehouseList(exportReqVO);
         // 导出 Excel
         List<BusinessWarehouseExcelVO> datas = BusinessWarehouseConvert.INSTANCE.convertList02(list);
-        ExcelUtils.write(response, "业务线/仓库.xls", "数据", BusinessWarehouseExcelVO.class, datas);
+        ExcelUtils.write(response, "业务线表.xls", "数据", BusinessWarehouseExcelVO.class, datas);
     }
 
 }
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseBaseVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseBaseVO.java
similarity index 64%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseBaseVO.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseBaseVO.java
index aa9be7d..07be2cc 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseBaseVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseBaseVO.java
@@ -1,4 +1,4 @@
-package com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo;
+package com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
@@ -12,7 +12,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
- * 业务线/仓库 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 业务线表 Base VO，提供给添加、修改、详细的子 VO 使用
  * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
  */
 @Data
@@ -22,7 +22,7 @@ public class BusinessWarehouseBaseVO {
     @NotNull(message = "业务线编号不能为空")
     private String businessCode;
 
-    @Schema(description = "业务线名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @Schema(description = "业务线名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
     @NotNull(message = "业务线名称不能为空")
     private String name;
 
@@ -32,16 +32,22 @@ public class BusinessWarehouseBaseVO {
     @Schema(description = "业务线LOGO")
     private String businessLogo;
 
-    @Schema(description = "父id")
+    @Schema(description = "父id", example = "3408")
     private Long parentId;
 
-    @Schema(description = "类型")
+    @Schema(description = "类型", example = "1")
     private String type;
 
-    @Schema(description = "状态")
+    @Schema(description = "状态", example = "1")
     private String status;
 
-    @Schema(description = "所属行业")
+    @Schema(description = "关联机构")
+    private Integer institutionNum;
+
+    @Schema(description = "成员数量")
+    private Integer employeeNum;
+
+    @Schema(description = "所属分类")
     private String industry;
 
     @Schema(description = "所在城市")
@@ -51,25 +57,26 @@ public class BusinessWarehouseBaseVO {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime establishDate;
 
-    @Schema(description = "归属人员")
+    @Schema(description = "归属人员", example = "26257")
     private Long belongUserId;
 
-    @Schema(description = "品牌/业务线/事业群名称")
+    @Schema(description = "品牌/业务线/事业群名称", example = "芋艿")
     private String brandName;
 
     @Schema(description = "电话")
     private Integer phone;
 
+    @Schema(description = "业务线仓库区分(0：业务线,1：仓库)", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "业务线仓库区分(0：业务线,1：仓库)不能为空")
+    private String diffFlag;
+
     @Schema(description = "传真")
     private String fax;
 
     @Schema(description = "网址", example = "https://www.iocoder.cn")
     private String url;
 
-    @Schema(description = "介绍", example = "你猜")
+    @Schema(description = "介绍", example = "随便")
     private String description;
 
-    @Schema(description = "区分标志", example = "你猜")
-    private String diffFlag;
-
 }
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseCreateReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseCreateReqVO.java
similarity index 65%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseCreateReqVO.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseCreateReqVO.java
index 18dd2d9..75b2144 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseCreateReqVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseCreateReqVO.java
@@ -1,11 +1,11 @@
-package com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo;
+package com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo;
 
 import lombok.*;
 import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import javax.validation.constraints.*;
 
-@Schema(description = "管理后台 - 业务线/仓库创建 Request VO")
+@Schema(description = "管理后台 - 业务线表创建 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExcelVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseExcelVO.java
similarity index 65%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExcelVO.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseExcelVO.java
index ebbb7ab..2669483 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExcelVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseExcelVO.java
@@ -1,4 +1,4 @@
-package com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo;
+package com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
@@ -13,7 +13,7 @@ import com.yunxi.scm.framework.excel.core.convert.DictConvert;
 
 
 /**
- * 业务线/仓库 Excel VO
+ * 业务线表 Excel VO
  *
  * @author 长江云息
  */
@@ -38,13 +38,21 @@ public class BusinessWarehouseExcelVO {
     @ExcelProperty("父id")
     private Long parentId;
 
-    @ExcelProperty("类型")
+    @ExcelProperty(value = "类型", converter = DictConvert.class)
+    @DictFormat("business_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
     private String type;
 
-    @ExcelProperty("状态")
+    @ExcelProperty(value = "状态", converter = DictConvert.class)
+    @DictFormat("class_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
     private String status;
 
-    @ExcelProperty(value = "所属行业", converter = DictConvert.class)
+    @ExcelProperty("关联机构")
+    private Integer institutionNum;
+
+    @ExcelProperty("成员数量")
+    private Integer employeeNum;
+
+    @ExcelProperty(value = "所属分类", converter = DictConvert.class)
     @DictFormat("duty_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
     private String industry;
 
@@ -63,6 +71,10 @@ public class BusinessWarehouseExcelVO {
     @ExcelProperty("电话")
     private Integer phone;
 
+    @ExcelProperty(value = "业务线仓库区分(0：业务线,1：仓库)", converter = DictConvert.class)
+    @DictFormat("diff_flag") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    private String diffFlag;
+
     @ExcelProperty("传真")
     private String fax;
 
@@ -75,7 +87,4 @@ public class BusinessWarehouseExcelVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-    @ExcelProperty("区分标志")
-    private String diffFlag;
-
 }
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExportReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseExportReqVO.java
similarity index 69%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExportReqVO.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseExportReqVO.java
index 87aeec3..e0f6a9c 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExportReqVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseExportReqVO.java
@@ -1,4 +1,4 @@
-package com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo;
+package com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo;
 
 import lombok.*;
 import java.util.*;
@@ -9,14 +9,14 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
-@Schema(description = "管理后台 - 业务线/仓库 Excel 导出 Request VO，参数和 BusinessWarehousePageReqVO 是一致的")
+@Schema(description = "管理后台 - 业务线表 Excel 导出 Request VO，参数和 BusinessWarehousePageReqVO 是一致的")
 @Data
 public class BusinessWarehouseExportReqVO {
 
     @Schema(description = "业务线编号")
     private String businessCode;
 
-    @Schema(description = "业务线名称", example = "张三")
+    @Schema(description = "业务线名称", example = "赵六")
     private String name;
 
     @Schema(description = "业务线简称")
@@ -25,7 +25,7 @@ public class BusinessWarehouseExportReqVO {
     @Schema(description = "业务线LOGO")
     private String businessLogo;
 
-    @Schema(description = "父id", example = "6675")
+    @Schema(description = "父id", example = "3408")
     private Long parentId;
 
     @Schema(description = "类型", example = "1")
@@ -34,7 +34,13 @@ public class BusinessWarehouseExportReqVO {
     @Schema(description = "状态", example = "1")
     private String status;
 
-    @Schema(description = "所属行业")
+    @Schema(description = "关联机构")
+    private Integer institutionNum;
+
+    @Schema(description = "成员数量")
+    private Integer employeeNum;
+
+    @Schema(description = "所属分类")
     private String industry;
 
     @Schema(description = "所在城市")
@@ -44,29 +50,29 @@ public class BusinessWarehouseExportReqVO {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] establishDate;
 
-    @Schema(description = "归属人员", example = "19777")
+    @Schema(description = "归属人员", example = "26257")
     private Long belongUserId;
 
-    @Schema(description = "品牌/业务线/事业群名称", example = "王五")
+    @Schema(description = "品牌/业务线/事业群名称", example = "芋艿")
     private String brandName;
 
     @Schema(description = "电话")
     private Integer phone;
 
+    @Schema(description = "业务线仓库区分(0：业务线,1：仓库)")
+    private String diffFlag;
+
     @Schema(description = "传真")
     private String fax;
 
     @Schema(description = "网址", example = "https://www.iocoder.cn")
     private String url;
 
-    @Schema(description = "介绍", example = "你猜")
+    @Schema(description = "介绍", example = "随便")
     private String description;
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-    @Schema(description = "区分标志", example = "你猜")
-    private String diffFlag;
-
 }
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehousePageReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehousePageReqVO.java
similarity index 72%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehousePageReqVO.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehousePageReqVO.java
index 3184129..782f966 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehousePageReqVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehousePageReqVO.java
@@ -1,4 +1,4 @@
-package com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo;
+package com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo;
 
 import lombok.*;
 import java.util.*;
@@ -9,7 +9,7 @@ import java.time.LocalDateTime;
 
 import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
-@Schema(description = "管理后台 - 业务线/仓库分页 Request VO")
+@Schema(description = "管理后台 - 业务线表分页 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
@@ -18,7 +18,7 @@ public class BusinessWarehousePageReqVO extends PageParam {
     @Schema(description = "业务线编号")
     private String businessCode;
 
-    @Schema(description = "业务线名称", example = "张三")
+    @Schema(description = "业务线名称", example = "赵六")
     private String name;
 
     @Schema(description = "业务线简称")
@@ -27,7 +27,7 @@ public class BusinessWarehousePageReqVO extends PageParam {
     @Schema(description = "业务线LOGO")
     private String businessLogo;
 
-    @Schema(description = "父id", example = "6675")
+    @Schema(description = "父id", example = "3408")
     private Long parentId;
 
     @Schema(description = "类型", example = "1")
@@ -36,7 +36,13 @@ public class BusinessWarehousePageReqVO extends PageParam {
     @Schema(description = "状态", example = "1")
     private String status;
 
-    @Schema(description = "所属行业")
+    @Schema(description = "关联机构")
+    private Integer institutionNum;
+
+    @Schema(description = "成员数量")
+    private Integer employeeNum;
+
+    @Schema(description = "所属分类")
     private String industry;
 
     @Schema(description = "所在城市")
@@ -46,29 +52,29 @@ public class BusinessWarehousePageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] establishDate;
 
-    @Schema(description = "归属人员", example = "19777")
+    @Schema(description = "归属人员", example = "26257")
     private Long belongUserId;
 
-    @Schema(description = "品牌/业务线/事业群名称", example = "王五")
+    @Schema(description = "品牌/业务线/事业群名称", example = "芋艿")
     private String brandName;
 
     @Schema(description = "电话")
     private Integer phone;
 
+    @Schema(description = "业务线仓库区分(0：业务线,1：仓库)")
+    private String diffFlag;
+
     @Schema(description = "传真")
     private String fax;
 
     @Schema(description = "网址", example = "https://www.iocoder.cn")
     private String url;
 
-    @Schema(description = "介绍", example = "你猜")
+    @Schema(description = "介绍", example = "随便")
     private String description;
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-    @Schema(description = "区分标志", example = "你猜")
-    private String diffFlag;
-
 }
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseRespVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseRespVO.java
similarity index 71%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseRespVO.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseRespVO.java
index 279a688..273b3ff 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseRespVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseRespVO.java
@@ -1,16 +1,16 @@
-package com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo;
+package com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.time.LocalDateTime;
 
-@Schema(description = "管理后台 - 业务线/仓库 Response VO")
+@Schema(description = "管理后台 - 业务线表 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class BusinessWarehouseRespVO extends BusinessWarehouseBaseVO {
 
-    @Schema(description = "业务id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27714")
+    @Schema(description = "业务id", requiredMode = Schema.RequiredMode.REQUIRED, example = "20782")
     private Long id;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseUpdateReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseUpdateReqVO.java
similarity index 69%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseUpdateReqVO.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseUpdateReqVO.java
index 1051779..67b3dab 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseUpdateReqVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseUpdateReqVO.java
@@ -1,17 +1,17 @@
-package com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo;
+package com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
 import javax.validation.constraints.*;
 
-@Schema(description = "管理后台 - 业务线/仓库更新 Request VO")
+@Schema(description = "管理后台 - 业务线表更新 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class BusinessWarehouseUpdateReqVO extends BusinessWarehouseBaseVO {
 
-    @Schema(description = "业务id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27714")
+    @Schema(description = "业务id", requiredMode = Schema.RequiredMode.REQUIRED, example = "20782")
     @NotNull(message = "业务id不能为空")
     private Long id;
 
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/EnterpriseController.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/EnterpriseController.java
similarity index 81%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/EnterpriseController.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/EnterpriseController.java
index 2cee7bf..cc1b3a9 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/EnterpriseController.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/EnterpriseController.java
@@ -1,4 +1,4 @@
-package com.yunxi.scm.module.xxjj.controller.admin.enterprise;
+package com.yunxi.scm.module.system.controller.admin.enterprise;
 
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -23,14 +23,14 @@ import com.yunxi.scm.framework.excel.core.util.ExcelUtils;
 import com.yunxi.scm.framework.operatelog.core.annotations.OperateLog;
 import static com.yunxi.scm.framework.operatelog.core.enums.OperateTypeEnum.*;
 
-import com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo.*;
-import com.yunxi.scm.module.xxjj.dal.dataobject.enterprise.EnterpriseDO;
-import com.yunxi.scm.module.xxjj.convert.enterprise.EnterpriseConvert;
-import com.yunxi.scm.module.xxjj.service.enterprise.EnterpriseService;
+import com.yunxi.scm.module.system.controller.admin.enterprise.vo.*;
+import com.yunxi.scm.module.system.dal.dataobject.enterprise.EnterpriseDO;
+import com.yunxi.scm.module.system.convert.enterprise.EnterpriseConvert;
+import com.yunxi.scm.module.system.service.enterprise.EnterpriseService;
 
 @Tag(name = "管理后台 - 企业信息")
 @RestController
-@RequestMapping("/xxjj/enterprise")
+@RequestMapping("/system/enterprise")
 @Validated
 public class EnterpriseController {
 
@@ -39,14 +39,14 @@ public class EnterpriseController {
 
     @PostMapping("/create")
     @Operation(summary = "创建企业信息")
-    @PreAuthorize("@ss.hasPermission('xxjj:enterprise:create')")
+    @PreAuthorize("@ss.hasPermission('system:enterprise:create')")
     public CommonResult<Long> createEnterprise(@Valid @RequestBody EnterpriseCreateReqVO createReqVO) {
         return success(enterpriseService.createEnterprise(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新企业信息")
-    @PreAuthorize("@ss.hasPermission('xxjj:enterprise:update')")
+    @PreAuthorize("@ss.hasPermission('system:enterprise:update')")
     public CommonResult<Boolean> updateEnterprise(@Valid @RequestBody EnterpriseUpdateReqVO updateReqVO) {
         enterpriseService.updateEnterprise(updateReqVO);
         return success(true);
@@ -55,7 +55,7 @@ public class EnterpriseController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除企业信息")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('xxjj:enterprise:delete')")
+    @PreAuthorize("@ss.hasPermission('system:enterprise:delete')")
     public CommonResult<Boolean> deleteEnterprise(@RequestParam("id") Long id) {
         enterpriseService.deleteEnterprise(id);
         return success(true);
@@ -64,7 +64,7 @@ public class EnterpriseController {
     @GetMapping("/get")
     @Operation(summary = "获得企业信息")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('xxjj:enterprise:query')")
+    @PreAuthorize("@ss.hasPermission('system:enterprise:query')")
     public CommonResult<EnterpriseRespVO> getEnterprise(@RequestParam("id") Long id) {
         EnterpriseDO enterprise = enterpriseService.getEnterprise(id);
         return success(EnterpriseConvert.INSTANCE.convert(enterprise));
@@ -73,7 +73,7 @@ public class EnterpriseController {
     @GetMapping("/list")
     @Operation(summary = "获得企业信息列表")
     @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
-    @PreAuthorize("@ss.hasPermission('xxjj:enterprise:query')")
+    @PreAuthorize("@ss.hasPermission('system:enterprise:query')")
     public CommonResult<List<EnterpriseRespVO>> getEnterpriseList(@RequestParam("ids") Collection<Long> ids) {
         List<EnterpriseDO> list = enterpriseService.getEnterpriseList(ids);
         return success(EnterpriseConvert.INSTANCE.convertList(list));
@@ -81,7 +81,7 @@ public class EnterpriseController {
 
     @GetMapping("/page")
     @Operation(summary = "获得企业信息分页")
-    @PreAuthorize("@ss.hasPermission('xxjj:enterprise:query')")
+    @PreAuthorize("@ss.hasPermission('system:enterprise:query')")
     public CommonResult<PageResult<EnterpriseRespVO>> getEnterprisePage(@Valid EnterprisePageReqVO pageVO) {
         PageResult<EnterpriseDO> pageResult = enterpriseService.getEnterprisePage(pageVO);
         return success(EnterpriseConvert.INSTANCE.convertPage(pageResult));
@@ -89,7 +89,7 @@ public class EnterpriseController {
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出企业信息 Excel")
-    @PreAuthorize("@ss.hasPermission('xxjj:enterprise:export')")
+    @PreAuthorize("@ss.hasPermission('system:enterprise:export')")
     @OperateLog(type = EXPORT)
     public void exportEnterpriseExcel(@Valid EnterpriseExportReqVO exportReqVO,
               HttpServletResponse response) throws IOException {
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseBaseVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseBaseVO.java
similarity index 73%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseBaseVO.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseBaseVO.java
index b4df461..e814adb 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseBaseVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseBaseVO.java
@@ -1,7 +1,9 @@
-package com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo;
+package com.yunxi.scm.module.system.controller.admin.enterprise.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.util.*;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
@@ -15,6 +17,8 @@ import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import javax.validation.constraints.*;
 
+import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
 /**
  * 企业信息 Base VO，提供给添加、修改、详细的子 VO 使用
  * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
@@ -53,10 +57,23 @@ public class EnterpriseBaseVO {
     @Schema(description = "代办人证件有效期类型(0：长期 1：非长期)")
     private String commissionOperator;
 
-    @Schema(description = "企业id", example = "9306")
-    private Long enterpriseId;
-
     @Schema(description = "总公司，子公司机构类型", example = "1")
     private String enterpriseType;
 
+    @Schema(description = "企业父id", example = "26924")
+    private Long parentId;
+
+    @Schema(description = "更新时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime updateTime;
+
+    @Schema(description = "首联系人")
+    private String firstConcat;
+
+    @Schema(description = "联系电话")
+    private String phone;
+
+    @Schema(description = "描述")
+    private String description;
+
 }
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseCreateReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseCreateReqVO.java
similarity index 98%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseCreateReqVO.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseCreateReqVO.java
index 5fa1861..0c0bbd9 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseCreateReqVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseCreateReqVO.java
@@ -1,4 +1,4 @@
-package com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo;
+package com.yunxi.scm.module.system.controller.admin.enterprise.vo;
 
 import lombok.*;
 import java.util.*;
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseExcelVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseExcelVO.java
similarity index 75%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseExcelVO.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseExcelVO.java
index dfd1e98..e86fc37 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseExcelVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseExcelVO.java
@@ -1,4 +1,4 @@
-package com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo;
+package com.yunxi.scm.module.system.controller.admin.enterprise.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
@@ -17,6 +17,9 @@ import java.time.LocalDateTime;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.yunxi.scm.framework.excel.core.annotations.DictFormat;
 import com.yunxi.scm.framework.excel.core.convert.DictConvert;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 
 /**
@@ -64,11 +67,23 @@ public class EnterpriseExcelVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-    @ExcelProperty("企业id")
-    private Long enterpriseId;
-
     @ExcelProperty(value = "总公司，子公司机构类型", converter = DictConvert.class)
     @DictFormat("enterprise_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
     private String enterpriseType;
 
+    @ExcelProperty("企业父id")
+    private Long parentId;
+
+    @Schema(description = "更新时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime updateTime;
+
+    @Schema(description = "首联系人")
+    private String firstConcat;
+
+    @Schema(description = "联系电话")
+    private String phone;
+
+    @Schema(description = "描述")
+    private String description;
 }
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseExportReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseExportReqVO.java
similarity index 76%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseExportReqVO.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseExportReqVO.java
index 4a86650..9938961 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseExportReqVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseExportReqVO.java
@@ -1,4 +1,4 @@
-package com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo;
+package com.yunxi.scm.module.system.controller.admin.enterprise.vo;
 
 import lombok.*;
 import java.util.*;
@@ -44,10 +44,22 @@ public class EnterpriseExportReqVO {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-    @Schema(description = "企业id", example = "9306")
-    private Long enterpriseId;
-
     @Schema(description = "总公司，子公司机构类型", example = "1")
     private String enterpriseType;
 
+    @Schema(description = "企业父id", example = "26924")
+    private Long parentId;
+
+    @Schema(description = "更新时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime updateTime;
+
+    @Schema(description = "首联系人")
+    private String firstConcat;
+
+    @Schema(description = "联系电话")
+    private String phone;
+
+    @Schema(description = "描述")
+    private String description;
 }
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterprisePageReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterprisePageReqVO.java
similarity index 76%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterprisePageReqVO.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterprisePageReqVO.java
index 4b35989..bf19109 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterprisePageReqVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterprisePageReqVO.java
@@ -1,4 +1,4 @@
-package com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo;
+package com.yunxi.scm.module.system.controller.admin.enterprise.vo;
 
 import lombok.*;
 import java.util.*;
@@ -46,10 +46,22 @@ public class EnterprisePageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-    @Schema(description = "企业id", example = "9306")
-    private Long enterpriseId;
-
     @Schema(description = "总公司，子公司机构类型", example = "1")
     private String enterpriseType;
 
+    @Schema(description = "企业父id", example = "26924")
+    private Long parentId;
+
+    @Schema(description = "更新时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime updateTime;
+
+    @Schema(description = "首联系人")
+    private String firstConcat;
+
+    @Schema(description = "联系电话")
+    private String phone;
+
+    @Schema(description = "描述")
+    private String description;
 }
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseRespVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseRespVO.java
similarity index 88%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseRespVO.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseRespVO.java
index bd6f589..5dcd1d6 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseRespVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseRespVO.java
@@ -1,4 +1,4 @@
-package com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo;
+package com.yunxi.scm.module.system.controller.admin.enterprise.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseUpdateReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseUpdateReqVO.java
similarity index 98%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseUpdateReqVO.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseUpdateReqVO.java
index 97e1a99..32ac970 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/enterprise/vo/EnterpriseUpdateReqVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/enterprise/vo/EnterpriseUpdateReqVO.java
@@ -1,4 +1,4 @@
-package com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo;
+package com.yunxi.scm.module.system.controller.admin.enterprise.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/businesswarehouse/BusinessWarehouseConvert.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/businesswarehouse/BusinessWarehouseConvert.java
similarity index 75%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/businesswarehouse/BusinessWarehouseConvert.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/businesswarehouse/BusinessWarehouseConvert.java
index 93423df..b3a23e3 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/businesswarehouse/BusinessWarehouseConvert.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/businesswarehouse/BusinessWarehouseConvert.java
@@ -1,4 +1,4 @@
-package com.yunxi.scm.module.xxjj.convert.businesswarehouse;
+package com.yunxi.scm.module.system.convert.businesswarehouse;
 
 import java.util.*;
 
@@ -6,11 +6,11 @@ import com.yunxi.scm.framework.common.pojo.PageResult;
 
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
-import com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo.*;
-import com.yunxi.scm.module.xxjj.dal.dataobject.businesswarehouse.BusinessWarehouseDO;
+import com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo.*;
+import com.yunxi.scm.module.system.dal.dataobject.businesswarehouse.BusinessWarehouseDO;
 
 /**
- * 业务线/仓库 Convert
+ * 业务线表 Convert
  *
  * @author 长江云息
  */
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/enterprise/EnterpriseConvert.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/enterprise/EnterpriseConvert.java
similarity index 77%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/enterprise/EnterpriseConvert.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/enterprise/EnterpriseConvert.java
index 9e7d469..73fa3a8 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/enterprise/EnterpriseConvert.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/enterprise/EnterpriseConvert.java
@@ -1,4 +1,4 @@
-package com.yunxi.scm.module.xxjj.convert.enterprise;
+package com.yunxi.scm.module.system.convert.enterprise;
 
 import java.util.*;
 
@@ -6,8 +6,8 @@ import com.yunxi.scm.framework.common.pojo.PageResult;
 
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
-import com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo.*;
-import com.yunxi.scm.module.xxjj.dal.dataobject.enterprise.EnterpriseDO;
+import com.yunxi.scm.module.system.controller.admin.enterprise.vo.*;
+import com.yunxi.scm.module.system.dal.dataobject.enterprise.EnterpriseDO;
 
 /**
  * 企业信息 Convert
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businesswarehouse/BusinessWarehouseDO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/businesswarehouse/BusinessWarehouseDO.java
similarity index 68%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businesswarehouse/BusinessWarehouseDO.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/businesswarehouse/BusinessWarehouseDO.java
index 1569420..3db54e8 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businesswarehouse/BusinessWarehouseDO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/businesswarehouse/BusinessWarehouseDO.java
@@ -1,6 +1,5 @@
-package com.yunxi.scm.module.xxjj.dal.dataobject.businesswarehouse;
+package com.yunxi.scm.module.system.dal.dataobject.businesswarehouse;
 
-import com.yunxi.scm.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 import java.util.*;
 import java.time.LocalDateTime;
@@ -10,19 +9,19 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.yunxi.scm.framework.mybatis.core.dataobject.BaseDO;
 
 /**
- * 业务线/仓库 DO
+ * 业务线表 DO
  *
  * @author 长江云息
  */
-@TableName("xxjj_business_warehouse")
-@KeySequence("xxjj_business_warehouse_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@TableName("system_business_warehouse")
+@KeySequence("system_business_warehouse_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class BusinessWarehouseDO extends TenantBaseDO {
+public class BusinessWarehouseDO extends BaseDO {
 
     /**
      * 业务id
@@ -51,14 +50,26 @@ public class BusinessWarehouseDO extends TenantBaseDO {
     private Long parentId;
     /**
      * 类型
+     *
+     * 枚举 {@link TODO business_type 对应的类}
      */
     private String type;
     /**
      * 状态
+     *
+     * 枚举 {@link TODO class_status 对应的类}
      */
     private String status;
     /**
-     * 所属行业
+     * 关联机构
+     */
+    private Integer institutionNum;
+    /**
+     * 成员数量
+     */
+    private Integer employeeNum;
+    /**
+     * 所属分类
      *
      * 枚举 {@link TODO duty_type 对应的类}
      */
@@ -83,6 +94,12 @@ public class BusinessWarehouseDO extends TenantBaseDO {
      * 电话
      */
     private Integer phone;
+    /**
+     * 业务线仓库区分(0：业务线,1：仓库)
+     *
+     * 枚举 {@link TODO diff_flag 对应的类}
+     */
+    private String diffFlag;
     /**
      * 传真
      */
@@ -95,9 +112,5 @@ public class BusinessWarehouseDO extends TenantBaseDO {
      * 介绍
      */
     private String description;
-    /**
-     * 区分标志
-     */
-    private String diffFlag;
 
 }
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/enterprise/EnterpriseDO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/enterprise/EnterpriseDO.java
similarity index 94%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/enterprise/EnterpriseDO.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/enterprise/EnterpriseDO.java
index 7758ebe..f58a1fb 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/enterprise/EnterpriseDO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/enterprise/EnterpriseDO.java
@@ -1,4 +1,4 @@
-package com.yunxi.scm.module.xxjj.dal.dataobject.enterprise;
+package com.yunxi.scm.module.system.dal.dataobject.enterprise;
 
 import lombok.*;
 import java.util.*;
@@ -20,8 +20,8 @@ import com.yunxi.scm.framework.mybatis.core.dataobject.BaseDO;
  *
  * @author 长江云息
  */
-@TableName("xxjj_enterprise")
-@KeySequence("xxjj_enterprise_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@TableName("system_enterprise")
+@KeySequence("system_enterprise_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
@@ -245,15 +245,15 @@ public class EnterpriseDO extends BaseDO {
      * 代办人证件有效期类型(0：长期 1：非长期)
      */
     private String commissionOperator;
-    /**
-     * 企业id
-     */
-    private Long enterpriseId;
     /**
      * 总公司，子公司机构类型
      *
      * 枚举 {@link TODO enterprise_type 对应的类}
      */
     private String enterpriseType;
+    /**
+     * 企业父id
+     */
+    private Long parentId;
 
 }
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java
similarity index 82%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java
index fe7e653..7aa3548 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java
@@ -1,16 +1,16 @@
-package com.yunxi.scm.module.xxjj.dal.mysql.businesswarehouse;
+package com.yunxi.scm.module.system.dal.mysql.businesswarehouse;
 
 import java.util.*;
 
 import com.yunxi.scm.framework.common.pojo.PageResult;
 import com.yunxi.scm.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.yunxi.scm.framework.mybatis.core.mapper.BaseMapperX;
-import com.yunxi.scm.module.xxjj.dal.dataobject.businesswarehouse.BusinessWarehouseDO;
+import com.yunxi.scm.module.system.dal.dataobject.businesswarehouse.BusinessWarehouseDO;
 import org.apache.ibatis.annotations.Mapper;
-import com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo.*;
+import com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo.*;
 
 /**
- * 业务线/仓库 Mapper
+ * 业务线表 Mapper
  *
  * @author 长江云息
  */
@@ -26,12 +26,15 @@ public interface BusinessWarehouseMapper extends BaseMapperX<BusinessWarehouseDO
                 .eqIfPresent(BusinessWarehouseDO::getParentId, reqVO.getParentId())
                 .eqIfPresent(BusinessWarehouseDO::getType, reqVO.getType())
                 .eqIfPresent(BusinessWarehouseDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(BusinessWarehouseDO::getInstitutionNum, reqVO.getInstitutionNum())
+                .eqIfPresent(BusinessWarehouseDO::getEmployeeNum, reqVO.getEmployeeNum())
                 .eqIfPresent(BusinessWarehouseDO::getIndustry, reqVO.getIndustry())
                 .eqIfPresent(BusinessWarehouseDO::getCity, reqVO.getCity())
                 .betweenIfPresent(BusinessWarehouseDO::getEstablishDate, reqVO.getEstablishDate())
                 .eqIfPresent(BusinessWarehouseDO::getBelongUserId, reqVO.getBelongUserId())
                 .likeIfPresent(BusinessWarehouseDO::getBrandName, reqVO.getBrandName())
                 .eqIfPresent(BusinessWarehouseDO::getPhone, reqVO.getPhone())
+                .eqIfPresent(BusinessWarehouseDO::getDiffFlag, reqVO.getDiffFlag())
                 .eqIfPresent(BusinessWarehouseDO::getFax, reqVO.getFax())
                 .eqIfPresent(BusinessWarehouseDO::getUrl, reqVO.getUrl())
                 .eqIfPresent(BusinessWarehouseDO::getDescription, reqVO.getDescription())
@@ -48,12 +51,15 @@ public interface BusinessWarehouseMapper extends BaseMapperX<BusinessWarehouseDO
                 .eqIfPresent(BusinessWarehouseDO::getParentId, reqVO.getParentId())
                 .eqIfPresent(BusinessWarehouseDO::getType, reqVO.getType())
                 .eqIfPresent(BusinessWarehouseDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(BusinessWarehouseDO::getInstitutionNum, reqVO.getInstitutionNum())
+                .eqIfPresent(BusinessWarehouseDO::getEmployeeNum, reqVO.getEmployeeNum())
                 .eqIfPresent(BusinessWarehouseDO::getIndustry, reqVO.getIndustry())
                 .eqIfPresent(BusinessWarehouseDO::getCity, reqVO.getCity())
                 .betweenIfPresent(BusinessWarehouseDO::getEstablishDate, reqVO.getEstablishDate())
                 .eqIfPresent(BusinessWarehouseDO::getBelongUserId, reqVO.getBelongUserId())
                 .likeIfPresent(BusinessWarehouseDO::getBrandName, reqVO.getBrandName())
                 .eqIfPresent(BusinessWarehouseDO::getPhone, reqVO.getPhone())
+                .eqIfPresent(BusinessWarehouseDO::getDiffFlag, reqVO.getDiffFlag())
                 .eqIfPresent(BusinessWarehouseDO::getFax, reqVO.getFax())
                 .eqIfPresent(BusinessWarehouseDO::getUrl, reqVO.getUrl())
                 .eqIfPresent(BusinessWarehouseDO::getDescription, reqVO.getDescription())
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/enterprise/EnterpriseMapper.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/enterprise/EnterpriseMapper.java
similarity index 87%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/enterprise/EnterpriseMapper.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/enterprise/EnterpriseMapper.java
index d80106d..4778927 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/enterprise/EnterpriseMapper.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/enterprise/EnterpriseMapper.java
@@ -1,13 +1,13 @@
-package com.yunxi.scm.module.xxjj.dal.mysql.enterprise;
+package com.yunxi.scm.module.system.dal.mysql.enterprise;
 
 import java.util.*;
 
 import com.yunxi.scm.framework.common.pojo.PageResult;
 import com.yunxi.scm.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.yunxi.scm.framework.mybatis.core.mapper.BaseMapperX;
-import com.yunxi.scm.module.xxjj.dal.dataobject.enterprise.EnterpriseDO;
+import com.yunxi.scm.module.system.dal.dataobject.enterprise.EnterpriseDO;
 import org.apache.ibatis.annotations.Mapper;
-import com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo.*;
+import com.yunxi.scm.module.system.controller.admin.enterprise.vo.*;
 
 /**
  * 企业信息 Mapper
@@ -29,8 +29,8 @@ public interface EnterpriseMapper extends BaseMapperX<EnterpriseDO> {
                 .eqIfPresent(EnterpriseDO::getCommissionCertificateType, reqVO.getCommissionCertificateType())
                 .eqIfPresent(EnterpriseDO::getCommissionOperator, reqVO.getCommissionOperator())
                 .betweenIfPresent(EnterpriseDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(EnterpriseDO::getEnterpriseId, reqVO.getEnterpriseId())
                 .eqIfPresent(EnterpriseDO::getEnterpriseType, reqVO.getEnterpriseType())
+                .eqIfPresent(EnterpriseDO::getParentId, reqVO.getParentId())
                 .orderByDesc(EnterpriseDO::getId));
     }
 
@@ -46,8 +46,8 @@ public interface EnterpriseMapper extends BaseMapperX<EnterpriseDO> {
                 .eqIfPresent(EnterpriseDO::getCommissionCertificateType, reqVO.getCommissionCertificateType())
                 .eqIfPresent(EnterpriseDO::getCommissionOperator, reqVO.getCommissionOperator())
                 .betweenIfPresent(EnterpriseDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(EnterpriseDO::getEnterpriseId, reqVO.getEnterpriseId())
                 .eqIfPresent(EnterpriseDO::getEnterpriseType, reqVO.getEnterpriseType())
+                .eqIfPresent(EnterpriseDO::getParentId, reqVO.getParentId())
                 .orderByDesc(EnterpriseDO::getId));
     }
 
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businesswarehouse/BusinessWarehouseService.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseService.java
similarity index 63%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businesswarehouse/BusinessWarehouseService.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseService.java
index 97a1b9d..8368217 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businesswarehouse/BusinessWarehouseService.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseService.java
@@ -1,20 +1,20 @@
-package com.yunxi.scm.module.xxjj.service.businesswarehouse;
+package com.yunxi.scm.module.system.service.businesswarehouse;
 
 import java.util.*;
 import javax.validation.*;
-import com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo.*;
-import com.yunxi.scm.module.xxjj.dal.dataobject.businesswarehouse.BusinessWarehouseDO;
+import com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo.*;
+import com.yunxi.scm.module.system.dal.dataobject.businesswarehouse.BusinessWarehouseDO;
 import com.yunxi.scm.framework.common.pojo.PageResult;
 
 /**
- * 业务线/仓库 Service 接口
+ * 业务线表 Service 接口
  *
  * @author 长江云息
  */
 public interface BusinessWarehouseService {
 
     /**
-     * 创建业务线/仓库
+     * 创建业务线表
      *
      * @param createReqVO 创建信息
      * @return 编号
@@ -22,48 +22,48 @@ public interface BusinessWarehouseService {
     Long createBusinessWarehouse(@Valid BusinessWarehouseCreateReqVO createReqVO);
 
     /**
-     * 更新业务线/仓库
+     * 更新业务线表
      *
      * @param updateReqVO 更新信息
      */
     void updateBusinessWarehouse(@Valid BusinessWarehouseUpdateReqVO updateReqVO);
 
     /**
-     * 删除业务线/仓库
+     * 删除业务线表
      *
      * @param id 编号
      */
     void deleteBusinessWarehouse(Long id);
 
     /**
-     * 获得业务线/仓库
+     * 获得业务线表
      *
      * @param id 编号
-     * @return 业务线/仓库
+     * @return 业务线表
      */
     BusinessWarehouseDO getBusinessWarehouse(Long id);
 
     /**
-     * 获得业务线/仓库列表
+     * 获得业务线表列表
      *
      * @param ids 编号
-     * @return 业务线/仓库列表
+     * @return 业务线表列表
      */
     List<BusinessWarehouseDO> getBusinessWarehouseList(Collection<Long> ids);
 
     /**
-     * 获得业务线/仓库分页
+     * 获得业务线表分页
      *
      * @param pageReqVO 分页查询
-     * @return 业务线/仓库分页
+     * @return 业务线表分页
      */
     PageResult<BusinessWarehouseDO> getBusinessWarehousePage(BusinessWarehousePageReqVO pageReqVO);
 
     /**
-     * 获得业务线/仓库列表, 用于 Excel 导出
+     * 获得业务线表列表, 用于 Excel 导出
      *
      * @param exportReqVO 查询条件
-     * @return 业务线/仓库列表
+     * @return 业务线表列表
      */
     List<BusinessWarehouseDO> getBusinessWarehouseList(BusinessWarehouseExportReqVO exportReqVO);
 
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businesswarehouse/BusinessWarehouseServiceImpl.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseServiceImpl.java
similarity index 82%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businesswarehouse/BusinessWarehouseServiceImpl.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseServiceImpl.java
index c5b56c4..cbf1c49 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businesswarehouse/BusinessWarehouseServiceImpl.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseServiceImpl.java
@@ -1,22 +1,22 @@
-package com.yunxi.scm.module.xxjj.service.businesswarehouse;
+package com.yunxi.scm.module.system.service.businesswarehouse;
 
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 
 import java.util.*;
-import com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo.*;
-import com.yunxi.scm.module.xxjj.dal.dataobject.businesswarehouse.BusinessWarehouseDO;
+import com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo.*;
+import com.yunxi.scm.module.system.dal.dataobject.businesswarehouse.BusinessWarehouseDO;
 import com.yunxi.scm.framework.common.pojo.PageResult;
 
-import com.yunxi.scm.module.xxjj.convert.businesswarehouse.BusinessWarehouseConvert;
-import com.yunxi.scm.module.xxjj.dal.mysql.businesswarehouse.BusinessWarehouseMapper;
+import com.yunxi.scm.module.system.convert.businesswarehouse.BusinessWarehouseConvert;
+import com.yunxi.scm.module.system.dal.mysql.businesswarehouse.BusinessWarehouseMapper;
 
 import static com.yunxi.scm.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.yunxi.scm.module.xxjj.enums.ErrorCodeConstants.*;
+import static com.yunxi.scm.module.system.enums.ErrorCodeConstants.*;
 
 /**
- * 业务线/仓库 Service 实现类
+ * 业务线表 Service 实现类
  *
  * @author 长江云息
  */
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseService.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseService.java
similarity index 87%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseService.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseService.java
index 131a98c..300512f 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseService.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseService.java
@@ -1,9 +1,9 @@
-package com.yunxi.scm.module.xxjj.service.enterprise;
+package com.yunxi.scm.module.system.service.enterprise;
 
 import java.util.*;
 import javax.validation.*;
-import com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo.*;
-import com.yunxi.scm.module.xxjj.dal.dataobject.enterprise.EnterpriseDO;
+import com.yunxi.scm.module.system.controller.admin.enterprise.vo.*;
+import com.yunxi.scm.module.system.dal.dataobject.enterprise.EnterpriseDO;
 import com.yunxi.scm.framework.common.pojo.PageResult;
 
 /**
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseServiceImpl.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseServiceImpl.java
similarity index 83%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseServiceImpl.java
rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseServiceImpl.java
index 2883b2a..65b5b31 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseServiceImpl.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseServiceImpl.java
@@ -1,19 +1,19 @@
-package com.yunxi.scm.module.xxjj.service.enterprise;
+package com.yunxi.scm.module.system.service.enterprise;
 
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 
 import java.util.*;
-import com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo.*;
-import com.yunxi.scm.module.xxjj.dal.dataobject.enterprise.EnterpriseDO;
+import com.yunxi.scm.module.system.controller.admin.enterprise.vo.*;
+import com.yunxi.scm.module.system.dal.dataobject.enterprise.EnterpriseDO;
 import com.yunxi.scm.framework.common.pojo.PageResult;
 
-import com.yunxi.scm.module.xxjj.convert.enterprise.EnterpriseConvert;
-import com.yunxi.scm.module.xxjj.dal.mysql.enterprise.EnterpriseMapper;
+import com.yunxi.scm.module.system.convert.enterprise.EnterpriseConvert;
+import com.yunxi.scm.module.system.dal.mysql.enterprise.EnterpriseMapper;
 
 import static com.yunxi.scm.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.yunxi.scm.module.xxjj.enums.ErrorCodeConstants.*;
+import static com.yunxi.scm.module.system.enums.ErrorCodeConstants.*;
 
 /**
  * 企业信息 Service 实现类
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/businesswarehouse/BusinessWarehouseMapper.xml b/yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/enterprise/EnterpriseMapper.xml
similarity index 84%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/businesswarehouse/BusinessWarehouseMapper.xml
rename to yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/enterprise/EnterpriseMapper.xml
index ab94ac8..e170329 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/businesswarehouse/BusinessWarehouseMapper.xml
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/enterprise/EnterpriseMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yunxi.scm.module.xxjj.dal.mysql.businesswarehouse.BusinessWarehouseMapper">
+<mapper namespace="com.yunxi.scm.module.system.dal.mysql.enterprise.EnterpriseMapper">
 
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/usergroup/businesswarehouse/BusinessWarehouseMapper.xml b/yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/usergroup/businesswarehouse/BusinessWarehouseMapper.xml
new file mode 100644
index 0000000..22cbd0b
--- /dev/null
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/usergroup/businesswarehouse/BusinessWarehouseMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yunxi.scm.module.system.dal.mysql.businesswarehouse.BusinessWarehouseMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/businesswarehouse/BusinessWarehouseServiceImplTest.java b/yunxi-module-system/yunxi-module-system-biz/src/test/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseServiceImplTest.java
similarity index 87%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/businesswarehouse/BusinessWarehouseServiceImplTest.java
rename to yunxi-module-system/yunxi-module-system-biz/src/test/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseServiceImplTest.java
index de89295..ba5f9b1 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/businesswarehouse/BusinessWarehouseServiceImplTest.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/test/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseServiceImplTest.java
@@ -1,4 +1,4 @@
-package com.yunxi.scm.module.xxjj.service.businesswarehouse;
+package com.yunxi.scm.module.system.service.businesswarehouse;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -8,9 +8,9 @@ import javax.annotation.Resource;
 
 import com.yunxi.scm.framework.test.core.ut.BaseDbUnitTest;
 
-import com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo.*;
-import com.yunxi.scm.module.xxjj.dal.dataobject.businesswarehouse.BusinessWarehouseDO;
-import com.yunxi.scm.module.xxjj.dal.mysql.businesswarehouse.BusinessWarehouseMapper;
+import com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo.*;
+import com.yunxi.scm.module.system.dal.dataobject.businesswarehouse.BusinessWarehouseDO;
+import com.yunxi.scm.module.system.dal.mysql.businesswarehouse.BusinessWarehouseMapper;
 import com.yunxi.scm.framework.common.pojo.PageResult;
 
 import javax.annotation.Resource;
@@ -19,7 +19,7 @@ import java.util.*;
 import java.time.LocalDateTime;
 
 import static cn.hutool.core.util.RandomUtil.*;
-import static com.yunxi.scm.module.xxjj.enums.ErrorCodeConstants.*;
+import static com.yunxi.scm.module.system.enums.ErrorCodeConstants.*;
 import static com.yunxi.scm.framework.test.core.util.AssertUtils.*;
 import static com.yunxi.scm.framework.test.core.util.RandomUtils.*;
 import static com.yunxi.scm.framework.common.util.date.LocalDateTimeUtils.*;
@@ -116,22 +116,25 @@ public class BusinessWarehouseServiceImplTest extends BaseDbUnitTest {
            o.setBusinessLogo(null);
            o.setParentId(null);
            o.setType(null);
+           o.setStatus(null);
+           o.setInstitutionNum(null);
+           o.setEmployeeNum(null);
            o.setIndustry(null);
            o.setCity(null);
            o.setEstablishDate(null);
            o.setBelongUserId(null);
            o.setBrandName(null);
            o.setPhone(null);
+           o.setDiffFlag(null);
            o.setFax(null);
            o.setUrl(null);
            o.setDescription(null);
            o.setCreateTime(null);
-           o.setDiffFlag(null);
        });
        businessWarehouseMapper.insert(dbBusinessWarehouse);
        // 测试 businessCode 不匹配
        businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setBusinessCode(null)));
-       // 测试 businessName 不匹配
+       // 测试 name 不匹配
        businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setName(null)));
        // 测试 businessSimple 不匹配
        businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setBusinessSimple(null)));
@@ -141,6 +144,12 @@ public class BusinessWarehouseServiceImplTest extends BaseDbUnitTest {
        businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setParentId(null)));
        // 测试 type 不匹配
        businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setType(null)));
+       // 测试 status 不匹配
+       businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setStatus(null)));
+       // 测试 institutionNum 不匹配
+       businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setInstitutionNum(null)));
+       // 测试 employeeNum 不匹配
+       businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setEmployeeNum(null)));
        // 测试 industry 不匹配
        businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setIndustry(null)));
        // 测试 city 不匹配
@@ -153,6 +162,8 @@ public class BusinessWarehouseServiceImplTest extends BaseDbUnitTest {
        businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setBrandName(null)));
        // 测试 phone 不匹配
        businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setPhone(null)));
+       // 测试 diffFlag 不匹配
+       businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setDiffFlag(null)));
        // 测试 fax 不匹配
        businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setFax(null)));
        // 测试 url 不匹配
@@ -161,8 +172,6 @@ public class BusinessWarehouseServiceImplTest extends BaseDbUnitTest {
        businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setDescription(null)));
        // 测试 createTime 不匹配
        businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setCreateTime(null)));
-        // 测试 diffFlag 不匹配
-       businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setDiffFlag(null)));
        // 准备参数
        BusinessWarehousePageReqVO reqVO = new BusinessWarehousePageReqVO();
        reqVO.setBusinessCode(null);
@@ -171,17 +180,21 @@ public class BusinessWarehouseServiceImplTest extends BaseDbUnitTest {
        reqVO.setBusinessLogo(null);
        reqVO.setParentId(null);
        reqVO.setType(null);
+       reqVO.setStatus(null);
+       reqVO.setInstitutionNum(null);
+       reqVO.setEmployeeNum(null);
        reqVO.setIndustry(null);
        reqVO.setCity(null);
        reqVO.setEstablishDate(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
        reqVO.setBelongUserId(null);
        reqVO.setBrandName(null);
        reqVO.setPhone(null);
+       reqVO.setDiffFlag(null);
        reqVO.setFax(null);
        reqVO.setUrl(null);
        reqVO.setDescription(null);
        reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
-       reqVO.setDiffFlag(null);
+
        // 调用
        PageResult<BusinessWarehouseDO> pageResult = businessWarehouseService.getBusinessWarehousePage(reqVO);
        // 断言
@@ -201,22 +214,25 @@ public class BusinessWarehouseServiceImplTest extends BaseDbUnitTest {
            o.setBusinessLogo(null);
            o.setParentId(null);
            o.setType(null);
+           o.setStatus(null);
+           o.setInstitutionNum(null);
+           o.setEmployeeNum(null);
            o.setIndustry(null);
            o.setCity(null);
            o.setEstablishDate(null);
            o.setBelongUserId(null);
            o.setBrandName(null);
            o.setPhone(null);
+           o.setDiffFlag(null);
            o.setFax(null);
            o.setUrl(null);
            o.setDescription(null);
            o.setCreateTime(null);
-           o.setDiffFlag(null);
        });
        businessWarehouseMapper.insert(dbBusinessWarehouse);
        // 测试 businessCode 不匹配
        businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setBusinessCode(null)));
-       // 测试 businessName 不匹配
+       // 测试 name 不匹配
        businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setName(null)));
        // 测试 businessSimple 不匹配
        businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setBusinessSimple(null)));
@@ -226,6 +242,12 @@ public class BusinessWarehouseServiceImplTest extends BaseDbUnitTest {
        businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setParentId(null)));
        // 测试 type 不匹配
        businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setType(null)));
+       // 测试 status 不匹配
+       businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setStatus(null)));
+       // 测试 institutionNum 不匹配
+       businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setInstitutionNum(null)));
+       // 测试 employeeNum 不匹配
+       businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setEmployeeNum(null)));
        // 测试 industry 不匹配
        businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setIndustry(null)));
        // 测试 city 不匹配
@@ -238,6 +260,8 @@ public class BusinessWarehouseServiceImplTest extends BaseDbUnitTest {
        businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setBrandName(null)));
        // 测试 phone 不匹配
        businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setPhone(null)));
+       // 测试 diffFlag 不匹配
+       businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setDiffFlag(null)));
        // 测试 fax 不匹配
        businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setFax(null)));
        // 测试 url 不匹配
@@ -246,8 +270,6 @@ public class BusinessWarehouseServiceImplTest extends BaseDbUnitTest {
        businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setDescription(null)));
        // 测试 createTime 不匹配
        businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setCreateTime(null)));
-       // 测试 diffFlag 不匹配
-       businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setDiffFlag(null)));
        // 准备参数
        BusinessWarehouseExportReqVO reqVO = new BusinessWarehouseExportReqVO();
        reqVO.setBusinessCode(null);
@@ -256,17 +278,20 @@ public class BusinessWarehouseServiceImplTest extends BaseDbUnitTest {
        reqVO.setBusinessLogo(null);
        reqVO.setParentId(null);
        reqVO.setType(null);
+       reqVO.setStatus(null);
+       reqVO.setInstitutionNum(null);
+       reqVO.setEmployeeNum(null);
        reqVO.setIndustry(null);
        reqVO.setCity(null);
        reqVO.setEstablishDate(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
        reqVO.setBelongUserId(null);
        reqVO.setBrandName(null);
        reqVO.setPhone(null);
+       reqVO.setDiffFlag(null);
        reqVO.setFax(null);
        reqVO.setUrl(null);
        reqVO.setDescription(null);
        reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
-       reqVO.setDiffFlag(null);
 
        // 调用
        List<BusinessWarehouseDO> list = businessWarehouseService.getBusinessWarehouseList(reqVO);
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseServiceImplTest.java b/yunxi-module-system/yunxi-module-system-biz/src/test/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseServiceImplTest.java
similarity index 93%
rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseServiceImplTest.java
rename to yunxi-module-system/yunxi-module-system-biz/src/test/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseServiceImplTest.java
index 7305bfc..3f40fc8 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/enterprise/EnterpriseServiceImplTest.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/test/java/com/yunxi/scm/module/system/service/enterprise/EnterpriseServiceImplTest.java
@@ -1,4 +1,4 @@
-package com.yunxi.scm.module.xxjj.service.enterprise;
+package com.yunxi.scm.module.system.service.enterprise;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -8,9 +8,9 @@ import javax.annotation.Resource;
 
 import com.yunxi.scm.framework.test.core.ut.BaseDbUnitTest;
 
-import com.yunxi.scm.module.xxjj.controller.admin.enterprise.vo.*;
-import com.yunxi.scm.module.xxjj.dal.dataobject.enterprise.EnterpriseDO;
-import com.yunxi.scm.module.xxjj.dal.mysql.enterprise.EnterpriseMapper;
+import com.yunxi.scm.module.system.controller.admin.enterprise.vo.*;
+import com.yunxi.scm.module.system.dal.dataobject.enterprise.EnterpriseDO;
+import com.yunxi.scm.module.system.dal.mysql.enterprise.EnterpriseMapper;
 import com.yunxi.scm.framework.common.pojo.PageResult;
 
 import javax.annotation.Resource;
@@ -19,7 +19,7 @@ import java.util.*;
 import java.time.LocalDateTime;
 
 import static cn.hutool.core.util.RandomUtil.*;
-import static com.yunxi.scm.module.xxjj.enums.ErrorCodeConstants.*;
+import static com.yunxi.scm.module.system.enums.ErrorCodeConstants.*;
 import static com.yunxi.scm.framework.test.core.util.AssertUtils.*;
 import static com.yunxi.scm.framework.test.core.util.RandomUtils.*;
 import static com.yunxi.scm.framework.common.util.date.LocalDateTimeUtils.*;
@@ -120,8 +120,8 @@ public class EnterpriseServiceImplTest extends BaseDbUnitTest {
            o.setCommissionCertificateType(null);
            o.setCommissionOperator(null);
            o.setCreateTime(null);
-           o.setEnterpriseId(null);
            o.setEnterpriseType(null);
+           o.setParentId(null);
        });
        enterpriseMapper.insert(dbEnterprise);
        // 测试 name 不匹配
@@ -144,10 +144,10 @@ public class EnterpriseServiceImplTest extends BaseDbUnitTest {
        enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setCommissionOperator(null)));
        // 测试 createTime 不匹配
        enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setCreateTime(null)));
-       // 测试 enterpriseId 不匹配
-       enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setEnterpriseId(null)));
        // 测试 enterpriseType 不匹配
        enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setEnterpriseType(null)));
+       // 测试 parentId 不匹配
+       enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setParentId(null)));
        // 准备参数
        EnterprisePageReqVO reqVO = new EnterprisePageReqVO();
        reqVO.setName(null);
@@ -160,8 +160,8 @@ public class EnterpriseServiceImplTest extends BaseDbUnitTest {
        reqVO.setCommissionCertificateType(null);
        reqVO.setCommissionOperator(null);
        reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
-       reqVO.setEnterpriseId(null);
        reqVO.setEnterpriseType(null);
+       reqVO.setParentId(null);
 
        // 调用
        PageResult<EnterpriseDO> pageResult = enterpriseService.getEnterprisePage(reqVO);
@@ -186,8 +186,8 @@ public class EnterpriseServiceImplTest extends BaseDbUnitTest {
            o.setCommissionCertificateType(null);
            o.setCommissionOperator(null);
            o.setCreateTime(null);
-           o.setEnterpriseId(null);
            o.setEnterpriseType(null);
+           o.setParentId(null);
        });
        enterpriseMapper.insert(dbEnterprise);
        // 测试 name 不匹配
@@ -210,10 +210,10 @@ public class EnterpriseServiceImplTest extends BaseDbUnitTest {
        enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setCommissionOperator(null)));
        // 测试 createTime 不匹配
        enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setCreateTime(null)));
-       // 测试 enterpriseId 不匹配
-       enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setEnterpriseId(null)));
        // 测试 enterpriseType 不匹配
        enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setEnterpriseType(null)));
+       // 测试 parentId 不匹配
+       enterpriseMapper.insert(cloneIgnoreId(dbEnterprise, o -> o.setParentId(null)));
        // 准备参数
        EnterpriseExportReqVO reqVO = new EnterpriseExportReqVO();
        reqVO.setName(null);
@@ -226,8 +226,8 @@ public class EnterpriseServiceImplTest extends BaseDbUnitTest {
        reqVO.setCommissionCertificateType(null);
        reqVO.setCommissionOperator(null);
        reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
-       reqVO.setEnterpriseId(null);
        reqVO.setEnterpriseType(null);
+       reqVO.setParentId(null);
 
        // 调用
        List<EnterpriseDO> list = enterpriseService.getEnterpriseList(reqVO);
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/enums/ErrorCodeConstants.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/enums/ErrorCodeConstants.java
index 502c1dc..1c247f6 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/enums/ErrorCodeConstants.java
+++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/enums/ErrorCodeConstants.java
@@ -44,6 +44,12 @@ public interface ErrorCodeConstants {
     // ========== 业务线/仓库 TODO 补充编号 ==========
     ErrorCode BUSINESS_WAREHOUSE_NOT_EXISTS = new ErrorCode(1002025019, "业务线/仓库不存在");
 
+    // ========== 业务线和用户关联 TODO 补充编号 ==========
+    ErrorCode BUSINESS_USER_RELATIONAL_NOT_EXISTS = new ErrorCode(1002025020, "业务线和用户关联不存在");
+
+    // ========== 业务线和机构关联 TODO 补充编号 ==========
+    ErrorCode BUSINESS_ENTERPRISE_RELATIONAL_NOT_EXISTS = new ErrorCode(1002025021, "业务线和机构关联不存在");
+
 
     // ========== 部门模块 1002004000 ==========
     ErrorCode MaterialCategory_NAME_DUPLICATE = new ErrorCode(1002004000, "已经存在该名字的部门");