From 5ea09ebe167cc5c33eafe8153eddabdd6f9ac911 Mon Sep 17 00:00:00 2001
From: ieaii <1069385070@qq.com>
Date: Mon, 30 Sep 2024 17:39:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=B0=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=B3=BB=E7=BB=9F=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin-hanhai-vue/.env                              |   2 +-
 admin-hanhai-vue/.env.development                  |   2 +-
 admin-hanhai-vue/public/index.html                 |   4 +-
 admin-hanhai-vue/src/assets/logo.png               | Bin 7749 -> 55924 bytes
 .../src/components/layouts/TabLayout.vue           |   2 +-
 .../src/components/layouts/UserLayout.vue          |   2 +-
 .../src/components/page/GlobalHeader.vue           |   4 +-
 admin-hanhai-vue/src/components/tools/Logo.vue     |   2 +-
 admin-hanhai-vue/src/views/system/CategoryList.vue |  12 +-
 admin-hanhai-vue/src/views/system/GoodsList.vue    |   8 +-
 .../src/views/system/HotelAddressList.vue          |  32 +-
 .../src/views/system/HotelBannerList.vue           |  14 +-
 .../src/views/system/HotelNoticeList.vue           |  16 +-
 .../src/views/system/HotelOrderList.vue            |  38 +--
 .../src/views/system/HotelShopList.vue             |  18 +-
 .../src/views/system/HotelShoppingCatList.vue      |  18 +-
 .../src/views/system/modules/HotelAddressForm.vue  |  14 +-
 .../src/views/system/modules/HotelBannerForm.vue   |  14 +-
 .../src/views/system/modules/HotelOrderForm.vue    |  22 +-
 .../src/views/system/modules/HotelShopForm.vue     |  18 +-
 .../views/system/modules/HotelShoppingCatForm.vue  |  18 +-
 han-hai-module-pay/han-hai-module-pay.iml          | 130 --------
 han-hai-parent.iml                                 |  62 ----
 .../jeecg-boot-base-api/jeecg-boot-base-api.iml    | 261 ----------------
 .../jeecg-system-cloud-api.iml                     | 296 ------------------
 .../target/jeecg-system-cloud-api-3.2.0.jar        | Bin 9792 -> 9792 bytes
 .../jeecg-system-local-api.iml                     | 282 -----------------
 .../jeecg-boot-base-core/jeecg-boot-base-core.iml  | 282 -----------------
 .../modules/hoteladdress/entity/HotelAddress.java  |   4 +
 .../hotelbalancelog/entity/HotelBalanceLog.java    |   3 +
 .../modules/hotelbanner/entity/HotelBanner.java    |   5 +-
 .../hotelcategory/entity/HotelCategory.java        |   7 +-
 .../entity/HotelCategoryItem.java                  |   3 +
 .../hotelleaselog/entity/HotelLeaseLog.java        |   3 +
 .../entity/HotelMemberAccount.java                 |   3 +
 .../modules/hotelnotice/entity/HotelNotice.java    |   3 +
 .../modules/hotelorder/entity/HotelOrder.java      |   8 +-
 .../hotelorderlog/entity/HotelOrderLog.java        |   3 +
 .../jeecg/modules/hotelshop/entity/HotelShop.java  |   9 +-
 .../hotelshoppingcat/entity/HotelShoppingCat.java  |   1 +
 .../target/jeecg-boot-base-core-3.2.0.jar          | Bin 502296 -> 502448 bytes
 .../compile/default-compile/createdFiles.lst       |   6 +
 .../jeecg-boot-base-tools.iml                      | 109 -------
 .../target/jeecg-boot-base-tools-3.2.0.jar         | Bin 29159 -> 29159 bytes
 jeecg-boot-base/jeecg-boot-base.iml                |  62 ----
 .../jeecg-boot-module-system.iml                   | 345 ---------------------
 .../xcx/order/service/impl/OrderServiceImpl.java   |   2 +
 47 files changed, 173 insertions(+), 1976 deletions(-)
 delete mode 100644 han-hai-module-pay/han-hai-module-pay.iml
 delete mode 100644 han-hai-parent.iml
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-api/jeecg-boot-base-api.iml
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-tools/jeecg-boot-base-tools.iml
 delete mode 100644 jeecg-boot-base/jeecg-boot-base.iml
 delete mode 100644 jeecg-boot-module-system/jeecg-boot-module-system.iml

diff --git a/admin-hanhai-vue/.env b/admin-hanhai-vue/.env
index adcac54..9b8ff66 100644
--- a/admin-hanhai-vue/.env
+++ b/admin-hanhai-vue/.env
@@ -1,5 +1,5 @@
 NODE_ENV=production
-VUE_APP_PLATFORM_NAME=冠尚彤语言训练系统
+VUE_APP_PLATFORM_NAME=布周到管理系统
 # 开启单点登录
 VUE_APP_SSO=false
 # 开启微应用模式
diff --git a/admin-hanhai-vue/.env.development b/admin-hanhai-vue/.env.development
index ee846cf..7e8bf61 100644
--- a/admin-hanhai-vue/.env.development
+++ b/admin-hanhai-vue/.env.development
@@ -1,5 +1,5 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=http://localhost:8081/hotel/
+VUE_APP_API_BASE_URL=https://hotel.java996.icu/hotel/
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
 
diff --git a/admin-hanhai-vue/public/index.html b/admin-hanhai-vue/public/index.html
index cdbae4a..544b395 100644
--- a/admin-hanhai-vue/public/index.html
+++ b/admin-hanhai-vue/public/index.html
@@ -5,7 +5,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
-  <title>冠尚彤语言训练系统</title>
+  <title>布周到管理系统</title>
 <!--  <link rel="icon" href="<%= BASE_URL %>logo.png">-->
   <script src="<%= BASE_URL %>cdn/babel-polyfill/polyfill_7_2_5.js"></script>
   <style>
@@ -249,7 +249,7 @@
     <div id="loader"></div>
     <div class="loader-section section-left"></div>
     <div class="loader-section section-right"></div>
-    <div class="load_title">正在加载 冠尚彤语言训练系统,请耐心等待
+    <div class="load_title">正在加载 布周到管理系统,请耐心等待
 
     </div>
   </div>
diff --git a/admin-hanhai-vue/src/assets/logo.png b/admin-hanhai-vue/src/assets/logo.png
index a4b790cd287f90594bf3cdd4cf03bfda4a75eef6..72be06d8856a2cf21172d8656244148a4e654f31 100644
GIT binary patch
literal 55924
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
OnH!Vy<+D3jllL#Q$MY`$

literal 7749
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

diff --git a/admin-hanhai-vue/src/components/layouts/TabLayout.vue b/admin-hanhai-vue/src/components/layouts/TabLayout.vue
index 4febd90..4dd1d5a 100644
--- a/admin-hanhai-vue/src/components/layouts/TabLayout.vue
+++ b/admin-hanhai-vue/src/components/layouts/TabLayout.vue
@@ -177,7 +177,7 @@
 
       // update-begin-author:sunjianlei date:20200120 for: 动态更改页面标题
       changeTitle(title) {
-        let projectTitle = "冠尚彤语言训练系统"
+        let projectTitle = "布周到管理系统"
         // 首页特殊处理
         if (this.$route.path === indexKey) {
           document.title = projectTitle
diff --git a/admin-hanhai-vue/src/components/layouts/UserLayout.vue b/admin-hanhai-vue/src/components/layouts/UserLayout.vue
index 154fb7e..5d263fa 100644
--- a/admin-hanhai-vue/src/components/layouts/UserLayout.vue
+++ b/admin-hanhai-vue/src/components/layouts/UserLayout.vue
@@ -5,7 +5,7 @@
         <div class="header">
           <a href="/">
 
-            <span class="title">冠尚彤语言训练系统</span>
+            <span class="title">布周到管理系统</span>
           </a>
         </div>
 <!--        <div class="desc">-->
diff --git a/admin-hanhai-vue/src/components/page/GlobalHeader.vue b/admin-hanhai-vue/src/components/page/GlobalHeader.vue
index e2ac55d..4bd3e05 100644
--- a/admin-hanhai-vue/src/components/page/GlobalHeader.vue
+++ b/admin-hanhai-vue/src/components/page/GlobalHeader.vue
@@ -17,8 +17,8 @@
         :type="collapsed ? 'menu-unfold' : 'menu-fold'"
         @click="toggle"/>
 
-      <span v-if="device === 'desktop'">欢迎进入 冠尚彤语言训练系统</span>
-      <span v-else>冠尚彤语言训练系统</span>
+      <span v-if="device === 'desktop'">欢迎进入 布周到管理系统</span>
+      <span v-else>布周到管理系统</span>
 
       <user-menu :theme="theme"/>
     </div>
diff --git a/admin-hanhai-vue/src/components/tools/Logo.vue b/admin-hanhai-vue/src/components/tools/Logo.vue
index 5dc8023..1637584 100644
--- a/admin-hanhai-vue/src/components/tools/Logo.vue
+++ b/admin-hanhai-vue/src/components/tools/Logo.vue
@@ -21,7 +21,7 @@
     props: {
       title: {
         type: String,
-        default: '冠尚彤',
+        default: '布周到',
         required: false
       },
       showTitle: {
diff --git a/admin-hanhai-vue/src/views/system/CategoryList.vue b/admin-hanhai-vue/src/views/system/CategoryList.vue
index 692f528..9c8fcd8 100644
--- a/admin-hanhai-vue/src/views/system/CategoryList.vue
+++ b/admin-hanhai-vue/src/views/system/CategoryList.vue
@@ -26,13 +26,13 @@
 
       <div class="table-operator" style="border-top: 5px">
         <a-button @click="handleAdd" type="primary" icon="plus">添加</a-button>
-        <a-button type="primary" icon="download" @click="handleExportXls('字典信息')">导出</a-button>
-        <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-          <a-button type="primary" icon="import">导入</a-button>
-        </a-upload>
-        <a-button type="primary" icon="sync" @click="refleshCache()">刷新缓存</a-button>
+<!--        <a-button type="primary" icon="download" @click="handleExportXls('字典信息')">导出</a-button>-->
+<!--        <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--          <a-button type="primary" icon="import">导入</a-button>-->
+<!--        </a-upload>-->
+<!--        <a-button type="primary" icon="sync" @click="refleshCache()">刷新缓存</a-button>-->
 
-        <a-button type="primary" icon="hdd" @click="openDeleteList">回收站</a-button>
+<!--        <a-button type="primary" icon="hdd" @click="openDeleteList">回收站</a-button>-->
       </div>
 
       <a-table
diff --git a/admin-hanhai-vue/src/views/system/GoodsList.vue b/admin-hanhai-vue/src/views/system/GoodsList.vue
index dc3a576..8ad0139 100644
--- a/admin-hanhai-vue/src/views/system/GoodsList.vue
+++ b/admin-hanhai-vue/src/views/system/GoodsList.vue
@@ -34,10 +34,10 @@
         <div class="table-operator" style="margin: 5px 0 10px 2px">
           <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
           <!--<a-button @click="handleEdit(model1)" type="primary" icon="plus">角色编辑</a-button>-->
-          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-            <a-button type="primary" icon="import">导入</a-button>
-          </a-upload>
-          <a-button type="primary" icon="download" @click="handleExportXls('角色管理')">导出</a-button>
+<!--          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--            <a-button type="primary" icon="import">导入</a-button>-->
+<!--          </a-upload>-->
+<!--          <a-button type="primary" icon="download" @click="handleExportXls('角色管理')">导出</a-button>-->
         </div>
 
         <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
diff --git a/admin-hanhai-vue/src/views/system/HotelAddressList.vue b/admin-hanhai-vue/src/views/system/HotelAddressList.vue
index fcfedce..b84cf06 100644
--- a/admin-hanhai-vue/src/views/system/HotelAddressList.vue
+++ b/admin-hanhai-vue/src/views/system/HotelAddressList.vue
@@ -12,10 +12,10 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('hotel_address')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('hotel_address')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
       <!-- 高级查询区域 -->
       <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
       <a-dropdown v-if="selectedRowKeys.length > 0">
@@ -122,7 +122,7 @@
             }
           },
           {
-            title:'用户Id',
+            title:'用户编号',
             align:"center",
             dataIndex: 'userId'
           },
@@ -147,14 +147,14 @@
             dataIndex: 'addressDetail'
           },
           {
-            title:'是否默认 0否 1是',
+            title:'是否默认',
             align:"center",
-            dataIndex: 'defaultFlag'
+            dataIndex: 'defaultFlag_dictText'
           },
           {
-            title:'是否删除 0否 1是',
+            title:'是否删除',
             align:"center",
-            dataIndex: 'delFlag'
+            dataIndex: 'delFlag_dictText'
           },
           {
             title: '操作',
@@ -171,7 +171,7 @@
           deleteBatch: "/hoteladdress/hotelAddress/deleteBatch",
           exportXlsUrl: "/hoteladdress/hotelAddress/exportXls",
           importExcelUrl: "hoteladdress/hotelAddress/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
@@ -191,12 +191,12 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'userId',text:'用户Id'})
-        fieldList.push({type:'string',value:'name',text:'收件人'})
-        fieldList.push({type:'string',value:'phone',text:'电话'})
-        fieldList.push({type:'string',value:'address',text:'所在地区'})
-        fieldList.push({type:'string',value:'addressDetail',text:'详细地址'})
-        fieldList.push({type:'int',value:'defaultFlag',text:'是否默认 0否 1是'})
-        fieldList.push({type:'int',value:'delFlag',text:'是否删除 0否 1是'})
+        // fieldList.push({type:'string',value:'name',text:'收件人'})
+        // fieldList.push({type:'string',value:'phone',text:'电话'})
+        // fieldList.push({type:'string',value:'address',text:'所在地区'})
+        // fieldList.push({type:'string',value:'addressDetail',text:'详细地址'})
+        // fieldList.push({type:'int',value:'defaultFlag',text:'是否默认 0否 1是'})
+        // fieldList.push({type:'int',value:'delFlag',text:'是否删除 0否 1是'})
         this.superFieldList = fieldList
       }
     }
diff --git a/admin-hanhai-vue/src/views/system/HotelBannerList.vue b/admin-hanhai-vue/src/views/system/HotelBannerList.vue
index 44b81fe..48d7cd6 100644
--- a/admin-hanhai-vue/src/views/system/HotelBannerList.vue
+++ b/admin-hanhai-vue/src/views/system/HotelBannerList.vue
@@ -12,10 +12,10 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('hotel_banner')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('hotel_banner')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
       <!-- 高级查询区域 -->
       <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
       <a-dropdown v-if="selectedRowKeys.length > 0">
@@ -122,7 +122,7 @@
             }
           },
           {
-            title:'pic',
+            title:'图片',
             align:"center",
             dataIndex: 'pic',
             scopedSlots: {customRender: 'imgSlot'}
@@ -138,7 +138,7 @@
             dataIndex: 'toUrl'
           },
           {
-            title:'delFlag',
+            title:'是否删除',
             align:"center",
             dataIndex: 'delFlag_dictText'
           },
@@ -157,7 +157,7 @@
           deleteBatch: "/hotelbanner/hotelBanner/deleteBatch",
           exportXlsUrl: "/hotelbanner/hotelBanner/exportXls",
           importExcelUrl: "hotelbanner/hotelBanner/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
diff --git a/admin-hanhai-vue/src/views/system/HotelNoticeList.vue b/admin-hanhai-vue/src/views/system/HotelNoticeList.vue
index b7ac3d0..9013c71 100644
--- a/admin-hanhai-vue/src/views/system/HotelNoticeList.vue
+++ b/admin-hanhai-vue/src/views/system/HotelNoticeList.vue
@@ -12,10 +12,10 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('hotel_notice')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('hotel_notice')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
       <!-- 高级查询区域 -->
       <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
       <a-dropdown v-if="selectedRowKeys.length > 0">
@@ -132,7 +132,7 @@
             dataIndex: 'content'
           },
           {
-            title:'delFlag',
+            title:'是否删除',
             align:"center",
             dataIndex: 'delFlag_dictText'
           },
@@ -151,7 +151,7 @@
           deleteBatch: "/hotelnotice/hotelNotice/deleteBatch",
           exportXlsUrl: "/hotelnotice/hotelNotice/exportXls",
           importExcelUrl: "hotelnotice/hotelNotice/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
@@ -171,8 +171,8 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
-        fieldList.push({type:'string',value:'content',text:'内容',dictCode:''})
-        fieldList.push({type:'int',value:'delFlag',text:'delFlag',dictCode:''})
+        // fieldList.push({type:'string',value:'content',text:'内容',dictCode:''})
+        // fieldList.push({type:'int',value:'delFlag',text:'delFlag',dictCode:''})
         this.superFieldList = fieldList
       }
     }
diff --git a/admin-hanhai-vue/src/views/system/HotelOrderList.vue b/admin-hanhai-vue/src/views/system/HotelOrderList.vue
index 6956a6b..5eda095 100644
--- a/admin-hanhai-vue/src/views/system/HotelOrderList.vue
+++ b/admin-hanhai-vue/src/views/system/HotelOrderList.vue
@@ -12,10 +12,10 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('hotel_order')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('hotel_order')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
       <!-- 高级查询区域 -->
       <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
       <a-dropdown v-if="selectedRowKeys.length > 0">
@@ -148,12 +148,12 @@
             dataIndex: 'userAddress'
           },
           {
-            title:'用户Id',
+            title:'用户编号',
             align:"center",
             dataIndex: 'userId'
           },
           {
-            title:'店铺id',
+            title:'店铺编号',
             align:"center",
             dataIndex: 'shopId'
           },
@@ -188,17 +188,17 @@
             dataIndex: 'orderPay'
           },
           {
-            title:'状态 0已下单 1进行中 2已完成 3已退款',
+            title:'状态',
             align:"center",
             dataIndex: 'status_dictText'
           },
           {
-            title:'类型 0水洗 1租赁 2破损 3退货',
+            title:'类型',
             align:"center",
             dataIndex: 'type_dictText'
           },
           {
-            title:'是否删除 0否 1是',
+            title:'是否删除',
             align:"center",
             dataIndex: 'delFlag_dictText'
           },
@@ -217,7 +217,7 @@
           deleteBatch: "/hotelorder/hotelOrder/deleteBatch",
           exportXlsUrl: "/hotelorder/hotelOrder/exportXls",
           importExcelUrl: "hotelorder/hotelOrder/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
@@ -237,21 +237,13 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
-        fieldList.push({type:'string',value:'pic',text:'商品图片',dictCode:''})
         fieldList.push({type:'string',value:'userName',text:'客户姓名',dictCode:''})
         fieldList.push({type:'string',value:'userPhone',text:'客户手机号',dictCode:''})
-        fieldList.push({type:'string',value:'userAddress',text:'用户地址',dictCode:''})
-        fieldList.push({type:'string',value:'userId',text:'用户Id',dictCode:''})
-        fieldList.push({type:'string',value:'shopId',text:'店铺id',dictCode:''})
-        fieldList.push({type:'string',value:'leaseTime',text:'租赁时间',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'payFee',text:'缴纳费用',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'deposit',text:'押金',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'washPay',text:'水洗费用',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'rentPay',text:'水洗费用',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'orderPay',text:'支付金额',dictCode:''})
-        fieldList.push({type:'int',value:'status',text:'状态 0已下单 1进行中 2已完成 3已退款',dictCode:''})
-        fieldList.push({type:'int',value:'type',text:'类型 0水洗 1租赁 2破损 3退货',dictCode:''})
-        fieldList.push({type:'int',value:'delFlag',text:'是否删除 0否 1是',dictCode:''})
+        fieldList.push({type:'string',value:'userId',text:'用户编号',dictCode:''})
+        fieldList.push({type:'string',value:'shopId',text:'店铺编号',dictCode:''})
+        fieldList.push({type:'int',value:'status',text:'状态',dictCode:'order_status'})
+        fieldList.push({type:'int',value:'type',text:'类型',dictCode:'hotel_order_type'})
+        fieldList.push({type:'int',value:'delFlag',text:'是否删除',dictCode:'is_delete'})
         this.superFieldList = fieldList
       }
     }
diff --git a/admin-hanhai-vue/src/views/system/HotelShopList.vue b/admin-hanhai-vue/src/views/system/HotelShopList.vue
index dee56c4..bdcfc67 100644
--- a/admin-hanhai-vue/src/views/system/HotelShopList.vue
+++ b/admin-hanhai-vue/src/views/system/HotelShopList.vue
@@ -12,10 +12,10 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('hotel_shop')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('hotel_shop')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
       <!-- 高级查询区域 -->
       <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
       <a-dropdown v-if="selectedRowKeys.length > 0">
@@ -127,7 +127,7 @@
             dataIndex: 'name'
           },
           {
-            title:'userId',
+            title:'用户编号',
             align:"center",
             dataIndex: 'userId'
           },
@@ -142,12 +142,12 @@
             dataIndex: 'phone'
           },
           {
-            title:'latitude',
+            title:'纬度',
             align:"center",
             dataIndex: 'latitude'
           },
           {
-            title:'longitude',
+            title:'经度',
             align:"center",
             dataIndex: 'longitude'
           },
@@ -157,7 +157,7 @@
             dataIndex: 'address'
           },
           {
-            title:'delFlag',
+            title:'是否删除',
             align:"center",
             dataIndex: 'delFlag_dictText'
           },
@@ -176,7 +176,7 @@
           deleteBatch: "/hotelshop/hotelShop/deleteBatch",
           exportXlsUrl: "/hotelshop/hotelShop/exportXls",
           importExcelUrl: "hotelshop/hotelShop/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
diff --git a/admin-hanhai-vue/src/views/system/HotelShoppingCatList.vue b/admin-hanhai-vue/src/views/system/HotelShoppingCatList.vue
index dd6a974..5e9be5c 100644
--- a/admin-hanhai-vue/src/views/system/HotelShoppingCatList.vue
+++ b/admin-hanhai-vue/src/views/system/HotelShoppingCatList.vue
@@ -12,10 +12,10 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('hotel_shopping_cat')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('hotel_shopping_cat')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
       <!-- 高级查询区域 -->
       <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
       <a-dropdown v-if="selectedRowKeys.length > 0">
@@ -122,22 +122,22 @@
             }
           },
           {
-            title:'商品id',
+            title:'商品编号',
             align:"center",
             dataIndex: 'goodsId'
           },
           {
-            title:'规格id',
+            title:'规格编号',
             align:"center",
             dataIndex: 'skuId'
           },
           {
-            title:'用户Id',
+            title:'用户编号',
             align:"center",
             dataIndex: 'userId'
           },
           {
-            title:'delFlag',
+            title:'是否删除',
             align:"center",
             dataIndex: 'delFlag_dictText'
           },
@@ -156,7 +156,7 @@
           deleteBatch: "/hotelshoppingcat/hotelShoppingCat/deleteBatch",
           exportXlsUrl: "/hotelshoppingcat/hotelShoppingCat/exportXls",
           importExcelUrl: "hotelshoppingcat/hotelShoppingCat/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
diff --git a/admin-hanhai-vue/src/views/system/modules/HotelAddressForm.vue b/admin-hanhai-vue/src/views/system/modules/HotelAddressForm.vue
index 3eb9945..ffa2f05 100644
--- a/admin-hanhai-vue/src/views/system/modules/HotelAddressForm.vue
+++ b/admin-hanhai-vue/src/views/system/modules/HotelAddressForm.vue
@@ -4,8 +4,8 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="用户Id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
-              <a-input v-model="model.userId" placeholder="请输入用户Id"  ></a-input>
+            <a-form-model-item label="用户编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <a-input v-model="model.userId" placeholder="请输入用户编号"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -29,13 +29,13 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="是否默认 0否 1是" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="defaultFlag">
-              <a-input-number v-model="model.defaultFlag" placeholder="请输入是否默认 0否 1是" style="width: 100%" />
+            <a-form-model-item label="是否默认" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="defaultFlag">
+              <j-dict-select-tag type="radio" v-model="model.defaultFlag" dictCode="is_delete" placeholder="请选择delFlag" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="是否删除 0否 1是" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
-              <a-input-number v-model="model.delFlag" placeholder="请输入是否删除 0否 1是" style="width: 100%" />
+            <a-form-model-item label="是否删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
+              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="is_delete" placeholder="请选择delFlag" />
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -129,7 +129,7 @@
               that.confirmLoading = false;
             })
           }
-         
+
         })
       },
     }
diff --git a/admin-hanhai-vue/src/views/system/modules/HotelBannerForm.vue b/admin-hanhai-vue/src/views/system/modules/HotelBannerForm.vue
index 1cc767e..889202d 100644
--- a/admin-hanhai-vue/src/views/system/modules/HotelBannerForm.vue
+++ b/admin-hanhai-vue/src/views/system/modules/HotelBannerForm.vue
@@ -4,7 +4,7 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="pic" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pic">
+            <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pic">
               <j-image-upload isMultiple  v-model="model.pic" ></j-image-upload>
             </a-form-model-item>
           </a-col>
@@ -18,11 +18,11 @@
               <a-input v-model="model.toUrl" placeholder="请输入跳转链接"  ></a-input>
             </a-form-model-item>
           </a-col>
-<!--          <a-col :span="24">-->
-<!--            <a-form-model-item label="delFlag" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">-->
-<!--              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="" placeholder="请选择delFlag" />-->
-<!--            </a-form-model-item>-->
-<!--          </a-col>-->
+          <a-col :span="24">
+            <a-form-model-item label="是否删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
+              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="is_delete" placeholder="请选择delFlag" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>
@@ -112,7 +112,7 @@
               that.confirmLoading = false;
             })
           }
-         
+
         })
       },
     }
diff --git a/admin-hanhai-vue/src/views/system/modules/HotelOrderForm.vue b/admin-hanhai-vue/src/views/system/modules/HotelOrderForm.vue
index 71f8df1..2dd78c1 100644
--- a/admin-hanhai-vue/src/views/system/modules/HotelOrderForm.vue
+++ b/admin-hanhai-vue/src/views/system/modules/HotelOrderForm.vue
@@ -29,13 +29,13 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="用户Id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
-              <a-input v-model="model.userId" placeholder="请输入用户Id"  ></a-input>
+            <a-form-model-item label="用户编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <a-input v-model="model.userId" placeholder="请输入用户编号"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="店铺id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopId">
-              <a-input v-model="model.shopId" placeholder="请输入店铺id"  ></a-input>
+            <a-form-model-item label="店铺编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopId">
+              <a-input v-model="model.shopId" placeholder="请输入店铺编号"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -69,18 +69,18 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="状态 0已下单 1进行中 2已完成 3已退款" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
-              <j-dict-select-tag type="list" v-model="model.status" dictCode="" placeholder="请选择状态 0已下单 1进行中 2已完成 3已退款" />
+            <a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
+              <j-dict-select-tag type="list" v-model="model.status" dictCode="order_status" placeholder="请选择状态 0已下单 1进行中 2已完成 3已退款" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="类型 0水洗 1租赁 2破损 3退货" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
-              <j-dict-select-tag type="list" v-model="model.type" dictCode="" placeholder="请选择类型 0水洗 1租赁 2破损 3退货" />
+            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
+              <j-dict-select-tag type="list" v-model="model.type" dictCode="hotel_order_type" placeholder="请选择类型 0水洗 1租赁 2破损 3退货" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="是否删除 0否 1是" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
-              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="" placeholder="请选择是否删除 0否 1是" />
+            <a-form-model-item label="是否删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
+              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="is_delete" placeholder="请选择是否删除 0否 1是" />
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -175,7 +175,7 @@
               that.confirmLoading = false;
             })
           }
-         
+
         })
       },
     }
diff --git a/admin-hanhai-vue/src/views/system/modules/HotelShopForm.vue b/admin-hanhai-vue/src/views/system/modules/HotelShopForm.vue
index f905388..440b77a 100644
--- a/admin-hanhai-vue/src/views/system/modules/HotelShopForm.vue
+++ b/admin-hanhai-vue/src/views/system/modules/HotelShopForm.vue
@@ -9,8 +9,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="userId" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
-              <a-input v-model="model.userId" placeholder="请输入userId"  ></a-input>
+            <a-form-model-item label="用户编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <a-input v-model="model.userId" placeholder="请输入用户编号"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -24,13 +24,13 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="latitude" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="latitude">
-              <a-input v-model="model.latitude" placeholder="请输入latitude"  ></a-input>
+            <a-form-model-item label="纬度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="latitude">
+              <a-input v-model="model.latitude" placeholder="请输入纬度"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="longitude" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="longitude">
-              <a-input v-model="model.longitude" placeholder="请输入longitude"  ></a-input>
+            <a-form-model-item label="经度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="longitude">
+              <a-input v-model="model.longitude" placeholder="请输入经度"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -39,8 +39,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="delFlag" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
-              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="" placeholder="请选择delFlag" />
+            <a-form-model-item label="是否删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
+              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="is_delete" placeholder="请选择delFlag" />
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -135,7 +135,7 @@
               that.confirmLoading = false;
             })
           }
-         
+
         })
       },
     }
diff --git a/admin-hanhai-vue/src/views/system/modules/HotelShoppingCatForm.vue b/admin-hanhai-vue/src/views/system/modules/HotelShoppingCatForm.vue
index f01058c..63ca206 100644
--- a/admin-hanhai-vue/src/views/system/modules/HotelShoppingCatForm.vue
+++ b/admin-hanhai-vue/src/views/system/modules/HotelShoppingCatForm.vue
@@ -4,23 +4,23 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="商品id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsId">
-              <a-input v-model="model.goodsId" placeholder="请输入商品id"  ></a-input>
+            <a-form-model-item label="商品编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsId">
+              <a-input v-model="model.goodsId" placeholder="请输入商品编号"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="规格id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="skuId">
-              <a-input v-model="model.skuId" placeholder="请输入规格id"  ></a-input>
+            <a-form-model-item label="规格编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="skuId">
+              <a-input v-model="model.skuId" placeholder="请输入规格编号"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="用户Id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
-              <a-input v-model="model.userId" placeholder="请输入用户Id"  ></a-input>
+            <a-form-model-item label="用户编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <a-input v-model="model.userId" placeholder="请输入用户编号"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="delFlag" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
-              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="" placeholder="请选择delFlag" />
+            <a-form-model-item label="是否删除" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
+              <j-dict-select-tag type="radio" v-model="model.delFlag" dictCode="is_delete" placeholder="请选择delFlag" />
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -115,7 +115,7 @@
               that.confirmLoading = false;
             })
           }
-         
+
         })
       },
     }
diff --git a/han-hai-module-pay/han-hai-module-pay.iml b/han-hai-module-pay/han-hai-module-pay.iml
deleted file mode 100644
index 0e31347..0000000
--- a/han-hai-module-pay/han-hai-module-pay.iml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <webroots />
-      </configuration>
-    </facet>
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.9" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.9" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.0" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.29" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.2.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.60" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.60" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.60" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: com.alipay.sdk:alipay-sdk-java:4.11.33.ALL" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.62" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.5.3" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.15" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.jacoco:org.jacoco.agent:runtime:0.8.5" level="project" />
-    <orderEntry type="library" name="Maven: org.ini4j:ini4j:0.5.4" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
-    <orderEntry type="library" name="Maven: io.opentracing:opentracing-api:0.33.0" level="project" />
-    <orderEntry type="library" name="Maven: io.opentracing:opentracing-util:0.33.0" level="project" />
-    <orderEntry type="library" name="Maven: io.opentracing:opentracing-noop:0.33.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-pay:3.5.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-common:3.5.0" level="project" />
-    <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.11" level="project" />
-    <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.13" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.36" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
-    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
-    <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.binarywang:qrcode-utils:1.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.zxing:core:3.2.1" level="project" />
-    <orderEntry type="library" name="Maven: org.jodd:jodd-http:3.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.jodd:jodd-core:3.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.jodd:jodd-upload:3.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.59" level="project" />
-    <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-miniapp:3.5.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-mp:3.5.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.6.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.4.8" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:2.4.8" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:9.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.21.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:4.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.11.22" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.11.22" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:4.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.8.4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.22" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.78" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/han-hai-parent.iml b/han-hai-parent.iml
deleted file mode 100644
index 9dbf17b..0000000
--- a/han-hai-parent.iml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-context:5.3.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-aop:5.3.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-beans:5.3.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-expression:5.3.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.2.9" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.9" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apache.logging.log4j:log4j-api:2.17.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.29" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.6.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.4.8" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:2.4.8" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:9.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.21.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:4.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.11.22" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.11.22" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:4.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-core:5.3.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-jcl:5.3.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.8.4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.22" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.78" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-api/jeecg-boot-base-api.iml b/jeecg-boot-base/jeecg-boot-base-api/jeecg-boot-base-api.iml
deleted file mode 100644
index 4e855fc..0000000
--- a/jeecg-boot-base/jeecg-boot-base-api/jeecg-boot-base-api.iml
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="jeecg-boot-base-core" />
-    <orderEntry type="module" module-name="jeecg-boot-base-tools" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.6.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.6.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.6.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.1.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.16" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-core:5.3.8" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-crypto:5.3.8" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.60" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.60" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-mail:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.mail:jakarta.mail:1.6.7" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.8.4" level="project" />
-    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.12" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.60" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.2.3.Final" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
-    <orderEntry type="library" name="Maven: io.micrometer:micrometer-registry-prometheus:1.8.4" level="project" />
-    <orderEntry type="library" name="Maven: io.prometheus:simpleclient_common:0.12.0" level="project" />
-    <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.12.0" level="project" />
-    <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_otel:0.12.0" level="project" />
-    <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_common:0.12.0" level="project" />
-    <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_otel_agent:0.12.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.3" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.9" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.22" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.22" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:dynamic-datasource-spring-boot-starter:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.6.7.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.3.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.persistence:javax.persistence-api:2.2" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.11.22" level="project" />
-    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss:jandex:2.4.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.1.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.6" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jaxb:txw2:2.3.6" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:3.0.12" level="project" />
-    <orderEntry type="library" name="Maven: org.jeecgframework.boot:hibernate-re:3.2.0-beta" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.28" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.microsoft.sqlserver:sqljdbc4:4.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.oracle:ojdbc6:11.2.0.3" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.postgresql:postgresql:42.2.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-quartz:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" />
-    <orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.15" level="project" />
-    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.11.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.2.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring-boot-starter:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.owasp.encoder:encoder:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.crazycake:shiro-redis:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: redis.clients:jedis:3.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-starter:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.25.0-GA" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.classgraph:classgraph:4.8.83" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webflux:3.0.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webmvc:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-oas:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models:2.1.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-core:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-boot-starter:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-data-rest:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-ui:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.jeecgframework.boot:codegenerate:1.3.8" level="project" />
-    <orderEntry type="library" name="Maven: org.jeecgframework:autopoi-web:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.jeecgframework:autopoi:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
-    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.3.04" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-scratchpad:4.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
-    <orderEntry type="library" name="Maven: io.minio:minio:8.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
-    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-dysmsapi:2.1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun.oss:aliyun-sdk-oss:3.11.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.15" level="project" />
-    <orderEntry type="library" name="Maven: org.jdom:jdom2:2.0.6.1" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.1" level="project" />
-    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jacoco:org.jacoco.agent:runtime:0.8.5" level="project" />
-    <orderEntry type="library" name="Maven: org.ini4j:ini4j:0.5.4" level="project" />
-    <orderEntry type="library" name="Maven: io.opentracing:opentracing-api:0.33.0" level="project" />
-    <orderEntry type="library" name="Maven: io.opentracing:opentracing-util:0.33.0" level="project" />
-    <orderEntry type="library" name="Maven: io.opentracing:opentracing-noop:0.33.0" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ram:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-kms:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: com.xkcoding.justauth:justauth-spring-boot-starter:1.3.4" level="project" />
-    <orderEntry type="library" name="Maven: me.zhyd.oauth:JustAuth:1.15.7" level="project" />
-    <orderEntry type="library" name="Maven: com.xkcoding.http:simple-http:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:4.4.1" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okio:okio:2.4.3" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.6.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-kotlin:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.6.10" level="project" />
-    <orderEntry type="library" name="Maven: bouncycastle:bcprov-jdk14:138" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.9" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.9" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.0" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.29" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.6.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.4.8" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:2.4.8" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:9.1" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.21.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:4.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.11.22" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:4.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.8.4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.22" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.78" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml
deleted file mode 100644
index a59849c..0000000
--- a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml
+++ /dev/null
@@ -1,296 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <webroots />
-      </configuration>
-    </facet>
-    <facet type="jpa" name="JPA">
-      <configuration>
-        <setting name="validation-enabled" value="true" />
-        <setting name="provider-name" value="Hibernate" />
-        <datasource-mapping>
-          <factory-entry name="jeecg-system-cloud-api" />
-        </datasource-mapping>
-        <naming-strategy-map />
-      </configuration>
-    </facet>
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.68" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.68" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.6.2" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:11.7" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:11.7" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
-    <orderEntry type="module" module-name="jeecg-boot-base-core" />
-    <orderEntry type="module" module-name="jeecg-boot-base-tools" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.6.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.6.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.6.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.1.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.16" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-core:5.3.8" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-crypto:5.3.8" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.60" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.60" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-mail:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.mail:jakarta.mail:1.6.7" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.8.4" level="project" />
-    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.12" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.60" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.2.3.Final" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
-    <orderEntry type="library" name="Maven: io.micrometer:micrometer-registry-prometheus:1.8.4" level="project" />
-    <orderEntry type="library" name="Maven: io.prometheus:simpleclient_common:0.12.0" level="project" />
-    <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.12.0" level="project" />
-    <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_otel:0.12.0" level="project" />
-    <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_common:0.12.0" level="project" />
-    <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_otel_agent:0.12.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.3" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.9" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.22" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.22" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:dynamic-datasource-spring-boot-starter:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.6.7.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.3.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.persistence:javax.persistence-api:2.2" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.11.22" level="project" />
-    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss:jandex:2.4.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.1.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.6" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jaxb:txw2:2.3.6" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:3.0.12" level="project" />
-    <orderEntry type="library" name="Maven: org.jeecgframework.boot:hibernate-re:3.2.0-beta" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.28" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.microsoft.sqlserver:sqljdbc4:4.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.oracle:ojdbc6:11.2.0.3" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.postgresql:postgresql:42.2.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-quartz:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" />
-    <orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.15" level="project" />
-    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.11.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.2.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring-boot-starter:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.owasp.encoder:encoder:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.crazycake:shiro-redis:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: redis.clients:jedis:3.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-starter:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.25.0-GA" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.classgraph:classgraph:4.8.83" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webflux:3.0.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webmvc:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-oas:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models:2.1.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-core:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-boot-starter:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-data-rest:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-ui:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.jeecgframework.boot:codegenerate:1.3.8" level="project" />
-    <orderEntry type="library" name="Maven: org.jeecgframework:autopoi-web:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.jeecgframework:autopoi:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
-    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.3.04" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-scratchpad:4.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
-    <orderEntry type="library" name="Maven: io.minio:minio:8.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
-    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-dysmsapi:2.1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun.oss:aliyun-sdk-oss:3.11.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.15" level="project" />
-    <orderEntry type="library" name="Maven: org.jdom:jdom2:2.0.6.1" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.1" level="project" />
-    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jacoco:org.jacoco.agent:runtime:0.8.5" level="project" />
-    <orderEntry type="library" name="Maven: org.ini4j:ini4j:0.5.4" level="project" />
-    <orderEntry type="library" name="Maven: io.opentracing:opentracing-api:0.33.0" level="project" />
-    <orderEntry type="library" name="Maven: io.opentracing:opentracing-util:0.33.0" level="project" />
-    <orderEntry type="library" name="Maven: io.opentracing:opentracing-noop:0.33.0" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ram:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-kms:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: com.xkcoding.justauth:justauth-spring-boot-starter:1.3.4" level="project" />
-    <orderEntry type="library" name="Maven: me.zhyd.oauth:JustAuth:1.15.7" level="project" />
-    <orderEntry type="library" name="Maven: com.xkcoding.http:simple-http:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:4.4.1" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okio:okio:2.4.3" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.6.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-kotlin:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.6.10" level="project" />
-    <orderEntry type="library" name="Maven: bouncycastle:bcprov-jdk14:138" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.9" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.9" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.0" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.29" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.6.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.4.8" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:2.4.8" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:9.1" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.21.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:4.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.11.22" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:4.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.8.4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.22" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.78" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/jeecg-system-cloud-api-3.2.0.jar b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/jeecg-system-cloud-api-3.2.0.jar
index 382db8a50f9b3270516480fdd2b7e63668c0097b..162915f2332f4b4706a2924302727fd618faf23b 100644
GIT binary patch
delta 287
zcmX@$bHIl;z?+$ci-CcIf#G?F-9%m$W)Nkvo>{5UZsId}5H*>DQ58%ZFzSHmct&H8
zs>xFs&B63}Mtd+V$m9T~LzuL{bR&}!m_Ei738FVEF?Tb885>yN@qif%h1PI`jNBX`
zx0w-aHk-nBu$}`7CSdxzf<0K=Qc)jFXDgb5>BWjRVEU1wGgzI5k~^3#Qt}7WN0b7<
pw79Yrm<~}60@Ev%Gr_c|N*<VQQ^^3+A5|j2=J}`=fa(3JjQ~;gWWN9a

delta 287
zcmX@$bHIl;z?+$ci-CcIf#F+$%|u=mW)Nkvo_TJO$;4;!AZjuPqbis-VAKKA@r=eG
zRg<SOnuF={jP_t!kjVi|hcIb@=|(0eFnx?E5=3uSV(w-FGd8fk;{h`k3a#O0w#iiA
z93Z!u5o|V_!gjEp0}3W!`n!TXSlm)kA53Q}nu6)YiZ)>Sk)ktLoraP-m@ZQC2h&HC
t0>HGmvK5#PQ4RvrE0r_Bw5UoRm~K<a0Mj2;B0vtA?4w!$Hg~^jBLE!gXLkSq

diff --git a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml
deleted file mode 100644
index 890cb15..0000000
--- a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml
+++ /dev/null
@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <webroots />
-      </configuration>
-    </facet>
-    <facet type="jpa" name="JPA">
-      <configuration>
-        <setting name="validation-enabled" value="true" />
-        <setting name="provider-name" value="Hibernate" />
-        <datasource-mapping>
-          <factory-entry name="jeecg-system-local-api" />
-        </datasource-mapping>
-        <naming-strategy-map />
-      </configuration>
-    </facet>
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="jeecg-boot-base-core" />
-    <orderEntry type="module" module-name="jeecg-boot-base-tools" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.6.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.6.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.6.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.1.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.16" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-core:5.3.8" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-crypto:5.3.8" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.60" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.60" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-mail:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.mail:jakarta.mail:1.6.7" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.8.4" level="project" />
-    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.12" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.60" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.2.3.Final" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
-    <orderEntry type="library" name="Maven: io.micrometer:micrometer-registry-prometheus:1.8.4" level="project" />
-    <orderEntry type="library" name="Maven: io.prometheus:simpleclient_common:0.12.0" level="project" />
-    <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.12.0" level="project" />
-    <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_otel:0.12.0" level="project" />
-    <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_common:0.12.0" level="project" />
-    <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_otel_agent:0.12.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.3" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.9" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.22" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.22" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:dynamic-datasource-spring-boot-starter:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.6.7.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.3.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.persistence:javax.persistence-api:2.2" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.11.22" level="project" />
-    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss:jandex:2.4.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.1.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.6" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jaxb:txw2:2.3.6" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:3.0.12" level="project" />
-    <orderEntry type="library" name="Maven: org.jeecgframework.boot:hibernate-re:3.2.0-beta" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.28" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.microsoft.sqlserver:sqljdbc4:4.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.oracle:ojdbc6:11.2.0.3" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.postgresql:postgresql:42.2.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-quartz:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" />
-    <orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.15" level="project" />
-    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.11.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.2.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring-boot-starter:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.owasp.encoder:encoder:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.crazycake:shiro-redis:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: redis.clients:jedis:3.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-starter:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.25.0-GA" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.classgraph:classgraph:4.8.83" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webflux:3.0.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webmvc:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-oas:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models:2.1.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-core:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-boot-starter:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-data-rest:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-ui:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.jeecgframework.boot:codegenerate:1.3.8" level="project" />
-    <orderEntry type="library" name="Maven: org.jeecgframework:autopoi-web:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.jeecgframework:autopoi:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
-    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.3.04" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-scratchpad:4.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
-    <orderEntry type="library" name="Maven: io.minio:minio:8.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
-    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-dysmsapi:2.1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun.oss:aliyun-sdk-oss:3.11.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.15" level="project" />
-    <orderEntry type="library" name="Maven: org.jdom:jdom2:2.0.6.1" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.1" level="project" />
-    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jacoco:org.jacoco.agent:runtime:0.8.5" level="project" />
-    <orderEntry type="library" name="Maven: org.ini4j:ini4j:0.5.4" level="project" />
-    <orderEntry type="library" name="Maven: io.opentracing:opentracing-api:0.33.0" level="project" />
-    <orderEntry type="library" name="Maven: io.opentracing:opentracing-util:0.33.0" level="project" />
-    <orderEntry type="library" name="Maven: io.opentracing:opentracing-noop:0.33.0" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ram:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-kms:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: com.xkcoding.justauth:justauth-spring-boot-starter:1.3.4" level="project" />
-    <orderEntry type="library" name="Maven: me.zhyd.oauth:JustAuth:1.15.7" level="project" />
-    <orderEntry type="library" name="Maven: com.xkcoding.http:simple-http:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:4.4.1" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okio:okio:2.4.3" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.6.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-kotlin:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.6.10" level="project" />
-    <orderEntry type="library" name="Maven: bouncycastle:bcprov-jdk14:138" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.9" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.9" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.0" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.29" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.6.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.4.8" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:2.4.8" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:9.1" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.21.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:4.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.11.22" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:4.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.8.4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.22" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.78" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml b/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml
deleted file mode 100644
index 1ddf35a..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml
+++ /dev/null
@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <webroots />
-      </configuration>
-    </facet>
-    <facet type="jpa" name="JPA">
-      <configuration>
-        <setting name="validation-enabled" value="true" />
-        <setting name="provider-name" value="Hibernate" />
-        <datasource-mapping>
-          <factory-entry name="jeecg-boot-base-core" />
-        </datasource-mapping>
-        <naming-strategy-map />
-      </configuration>
-    </facet>
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="jeecg-boot-base-tools" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.6.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.6.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.6.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.1.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.16" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-core:5.3.8" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-crypto:5.3.8" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.9" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.9" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.0" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.29" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.60" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.60" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-mail:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.mail:jakarta.mail:1.6.7" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.8.4" level="project" />
-    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.12" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.60" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.2.3.Final" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
-    <orderEntry type="library" name="Maven: io.micrometer:micrometer-registry-prometheus:1.8.4" level="project" />
-    <orderEntry type="library" name="Maven: io.prometheus:simpleclient_common:0.12.0" level="project" />
-    <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.12.0" level="project" />
-    <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_otel:0.12.0" level="project" />
-    <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_common:0.12.0" level="project" />
-    <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_otel_agent:0.12.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.3" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.9" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.22" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.22" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:dynamic-datasource-spring-boot-starter:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.6.7.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.3.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.persistence:javax.persistence-api:2.2" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.11.22" level="project" />
-    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss:jandex:2.4.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.1.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.6" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jaxb:txw2:2.3.6" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:3.0.12" level="project" />
-    <orderEntry type="library" name="Maven: org.jeecgframework.boot:hibernate-re:3.2.0-beta" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.27" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.microsoft.sqlserver:sqljdbc4:4.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.oracle:ojdbc6:11.2.0.3" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.postgresql:postgresql:42.2.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-quartz:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" />
-    <orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.15" level="project" />
-    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.11.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.2.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring-boot-starter:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.owasp.encoder:encoder:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.crazycake:shiro-redis:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: redis.clients:jedis:3.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-starter:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.25.0-GA" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.classgraph:classgraph:4.8.83" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webflux:3.0.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webmvc:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-oas:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models:2.1.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-core:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-boot-starter:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-data-rest:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-ui:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.jeecgframework.boot:codegenerate:1.3.8" level="project" />
-    <orderEntry type="library" name="Maven: org.jeecgframework:autopoi-web:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.jeecgframework:autopoi:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
-    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.3.04" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-scratchpad:4.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
-    <orderEntry type="library" name="Maven: io.minio:minio:8.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
-    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-dysmsapi:2.1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun.oss:aliyun-sdk-oss:3.11.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.15" level="project" />
-    <orderEntry type="library" name="Maven: org.jdom:jdom2:2.0.6.1" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.1" level="project" />
-    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.5.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jacoco:org.jacoco.agent:runtime:0.8.5" level="project" />
-    <orderEntry type="library" name="Maven: org.ini4j:ini4j:0.5.4" level="project" />
-    <orderEntry type="library" name="Maven: io.opentracing:opentracing-api:0.33.0" level="project" />
-    <orderEntry type="library" name="Maven: io.opentracing:opentracing-util:0.33.0" level="project" />
-    <orderEntry type="library" name="Maven: io.opentracing:opentracing-noop:0.33.0" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ram:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-kms:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: com.xkcoding.justauth:justauth-spring-boot-starter:1.3.4" level="project" />
-    <orderEntry type="library" name="Maven: me.zhyd.oauth:JustAuth:1.15.7" level="project" />
-    <orderEntry type="library" name="Maven: com.xkcoding.http:simple-http:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:4.4.1" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okio:okio:2.4.3" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.6.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-kotlin:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.6.10" level="project" />
-    <orderEntry type="library" name="Maven: bouncycastle:bcprov-jdk14:138" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.6.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.4.8" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:2.4.8" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:9.1" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.21.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:4.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.11.22" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:4.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.8.4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.22" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.78" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hoteladdress/entity/HotelAddress.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hoteladdress/entity/HotelAddress.java
index 575e4ef..ce5b740 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hoteladdress/entity/HotelAddress.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hoteladdress/entity/HotelAddress.java
@@ -6,6 +6,7 @@ import java.util.Date;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -56,10 +57,13 @@ public class HotelAddress implements Serializable {
     @ApiModelProperty(value = "详细地址")
     private java.lang.String addressDetail;
 	/**是否默认 0否 1是*/
+	@Dict(dicCode = "is_delete")
 	@Excel(name = "是否默认 0否 1是", width = 15)
     @ApiModelProperty(value = "是否默认 0否 1是")
     private java.lang.Integer defaultFlag;
 	/**是否删除 0否 1是*/
+    @TableLogic
+    @Dict(dicCode = "is_delete")
 	@Excel(name = "是否删除 0否 1是", width = 15)
     @ApiModelProperty(value = "是否删除 0否 1是")
     private java.lang.Integer delFlag;
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelbalancelog/entity/HotelBalanceLog.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelbalancelog/entity/HotelBalanceLog.java
index 16e0e63..d0a7fa8 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelbalancelog/entity/HotelBalanceLog.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelbalancelog/entity/HotelBalanceLog.java
@@ -6,6 +6,7 @@ import java.util.Date;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -56,6 +57,8 @@ public class HotelBalanceLog implements Serializable {
     @ApiModelProperty(value = "状态 0未审核 1已审核未打款 2已打款 3审核未通过")
     private java.lang.Integer status;
 	/**是否删除 0否 1是*/
+	@TableLogic
+	@Dict(dicCode = "is_delete")
 	@Excel(name = "是否删除 0否 1是", width = 15)
     @ApiModelProperty(value = "是否删除 0否 1是")
     private java.lang.Integer delFlag;
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelbanner/entity/HotelBanner.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelbanner/entity/HotelBanner.java
index bef3cd2..58e235a 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelbanner/entity/HotelBanner.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelbanner/entity/HotelBanner.java
@@ -6,6 +6,7 @@ import java.util.Date;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -35,7 +36,7 @@ public class HotelBanner implements Serializable {
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "id")
     private java.lang.String id;
-	/**pic*/
+	/**图片*/
 	@Excel(name = "pic", width = 15)
     @ApiModelProperty(value = "pic")
     private java.lang.String pic;
@@ -48,6 +49,8 @@ public class HotelBanner implements Serializable {
     @ApiModelProperty(value = "跳转链接")
     private java.lang.String toUrl;
 	/**delFlag*/
+    @TableLogic
+	@Dict(dicCode = "is_delete")
 	@Excel(name = "delFlag", width = 15)
     @ApiModelProperty(value = "delFlag")
     private java.lang.Integer delFlag;
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcategory/entity/HotelCategory.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcategory/entity/HotelCategory.java
index 589b225..2eaa321 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcategory/entity/HotelCategory.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcategory/entity/HotelCategory.java
@@ -6,10 +6,7 @@ import java.util.Date;
 import java.math.BigDecimal;
 import java.util.List;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.hibernate.annotations.Table;
@@ -55,6 +52,8 @@ public class HotelCategory implements Serializable {
     @ApiModelProperty(value = "排序")
     private java.lang.Integer sort;
 	/**是否删除 0否 1是*/
+    @TableLogic
+	@Dict(dicCode = "is_delete")
 	@Excel(name = "是否删除 0否 1是", width = 15)
     @ApiModelProperty(value = "是否删除 0否 1是")
     private java.lang.Integer delFlag;
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcategoryitem/entity/HotelCategoryItem.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcategoryitem/entity/HotelCategoryItem.java
index f86989c..e269c8c 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcategoryitem/entity/HotelCategoryItem.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelcategoryitem/entity/HotelCategoryItem.java
@@ -6,6 +6,7 @@ import java.util.Date;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -55,6 +56,8 @@ public class HotelCategoryItem implements Serializable {
 	/**图片*/
 	private String pic;
 	/**是否删除 0否 1是*/
+    @TableLogic
+	@Dict(dicCode = "is_delete")
 	@Excel(name = "是否删除 0否 1是", width = 15)
     @ApiModelProperty(value = "是否删除 0否 1是")
     private java.lang.Integer delFlag;
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/entity/HotelLeaseLog.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/entity/HotelLeaseLog.java
index e4831d8..b01657a 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/entity/HotelLeaseLog.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelleaselog/entity/HotelLeaseLog.java
@@ -6,6 +6,7 @@ import java.util.Date;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -68,6 +69,8 @@ public class HotelLeaseLog implements Serializable {
     @ApiModelProperty(value = "租赁结束时间")
     private java.util.Date endTime;
 	/**是否删除 0否 1是*/
+	@TableLogic
+	@Dict(dicCode = "is_delete")
 	@Excel(name = "是否删除 0否 1是", width = 15)
     @ApiModelProperty(value = "是否删除 0否 1是")
     private java.lang.Integer delFlag;
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelmemberaccount/entity/HotelMemberAccount.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelmemberaccount/entity/HotelMemberAccount.java
index 5285380..43def53 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelmemberaccount/entity/HotelMemberAccount.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelmemberaccount/entity/HotelMemberAccount.java
@@ -6,6 +6,7 @@ import java.util.Date;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -52,6 +53,8 @@ public class HotelMemberAccount implements Serializable {
     @ApiModelProperty(value = "店铺佣金")
     private java.math.BigDecimal shopBalance;
 	/**是否删除 0否 1是*/
+    @TableLogic
+	@Dict(dicCode = "is_delete")
 	@Excel(name = "是否删除 0否 1是", width = 15)
     @ApiModelProperty(value = "是否删除 0否 1是")
     private java.lang.Integer delFlag;
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelnotice/entity/HotelNotice.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelnotice/entity/HotelNotice.java
index dae12a6..d697c2e 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelnotice/entity/HotelNotice.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelnotice/entity/HotelNotice.java
@@ -6,6 +6,7 @@ import java.util.Date;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -44,6 +45,8 @@ public class HotelNotice implements Serializable {
     @ApiModelProperty(value = "内容")
     private java.lang.String content;
 	/**delFlag*/
+    @TableLogic
+	@Dict(dicCode = "is_delete")
 	@Excel(name = "delFlag", width = 15)
     @ApiModelProperty(value = "delFlag")
     private java.lang.Integer delFlag;
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/entity/HotelOrder.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/entity/HotelOrder.java
index f56434d..b2277b7 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/entity/HotelOrder.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorder/entity/HotelOrder.java
@@ -4,10 +4,8 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -125,6 +123,8 @@ public class HotelOrder implements Serializable {
     @ApiModelProperty(value = "类型 0租赁 1水洗  2破损 3退货")
     private java.lang.Integer type;
 	/**是否删除 0否 1是*/
+	@TableLogic
+	@Dict(dicCode = "is_delete")
 	@Excel(name = "是否删除 0否 1是", width = 15)
     @ApiModelProperty(value = "是否删除 0否 1是")
     private java.lang.Integer delFlag;
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderlog/entity/HotelOrderLog.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderlog/entity/HotelOrderLog.java
index 662ad3d..f748c17 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderlog/entity/HotelOrderLog.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelorderlog/entity/HotelOrderLog.java
@@ -6,6 +6,7 @@ import java.util.Date;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -44,6 +45,8 @@ public class HotelOrderLog implements Serializable {
     @ApiModelProperty(value = "是否支付 0否 1是")
     private java.lang.Integer isPay;
 	/**是否删除*/
+    @TableLogic
+    @Dict(dicCode = "is_delete")
 	@Excel(name = "是否删除", width = 15)
     @ApiModelProperty(value = "是否删除")
     private java.lang.Integer delFlag;
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshop/entity/HotelShop.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshop/entity/HotelShop.java
index 1aea2d3..aae22c1 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshop/entity/HotelShop.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshop/entity/HotelShop.java
@@ -4,10 +4,8 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -65,8 +63,11 @@ public class HotelShop implements Serializable {
     @ApiModelProperty(value = "地址")
     private java.lang.String address;
 	/**0未审核 1审核通过 2审核未通过*/
+	@Dict(dicCode = "shop_status")
 	private Integer status;
 	/**delFlag*/
+	@TableLogic
+	@Dict(dicCode = "is_delete")
 	@Excel(name = "delFlag", width = 15)
     @ApiModelProperty(value = "delFlag")
     private java.lang.Integer delFlag;
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoppingcat/entity/HotelShoppingCat.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoppingcat/entity/HotelShoppingCat.java
index 4bc8425..e2b43c5 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoppingcat/entity/HotelShoppingCat.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hotelshoppingcat/entity/HotelShoppingCat.java
@@ -50,6 +50,7 @@ public class HotelShoppingCat implements Serializable {
     private java.lang.String userId;
 	/**delFlag*/
 	@TableLogic
+    @Dict(dicCode = "is_delete")
 	@Excel(name = "delFlag", width = 15)
     @ApiModelProperty(value = "delFlag")
     private java.lang.Integer delFlag;
diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/jeecg-boot-base-core-3.2.0.jar b/jeecg-boot-base/jeecg-boot-base-core/target/jeecg-boot-base-core-3.2.0.jar
index c23d8eb113c9f6353a862d49797264049c5dcb5c..ba831dabdc074eecd15d269aa0c3bbec285266fb 100644
GIT binary patch
delta 22953
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
J!B>>%{ts&&=cE7t

delta 23064
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

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index 9dee6b1..64f77af 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -74,6 +74,7 @@ org\jeecg\config\shiro\filters\CustomShiroFilterFactoryBean$MySpringShiroFilter.
 org\jeecg\common\constant\CommonSendStatus.class
 org\jeecg\common\system\query\QueryGenerator$1.class
 org\jeecg\modules\hotelconf\entity\HotelConf.class
+org\jeecg\modules\hotelorderlog\service\IHotelOrderLogService.class
 org\jeecg\common\system\util\JwtUtil.class
 org\jeecg\common\util\security\SecurityTools.class
 org\jeecg\common\system\base\service\impl\JeecgServiceImpl.class
@@ -103,6 +104,7 @@ org\jeecg\modules\hotelgoodssku\service\impl\HotelGoodsSkuServiceImpl.class
 org\jeecg\modules\hotelbanner\controller\HotelBannerController.class
 org\jeecg\common\util\DateUtils$7.class
 org\jeecg\modules\hotelmemberaccount\service\impl\HotelMemberAccountServiceImpl.class
+org\jeecg\modules\hotelorderlog\controller\HotelOrderLogController.class
 org\jeecg\common\aspect\annotation\OnlineAuth.class
 org\jeecg\modules\hotelcategoryitem\service\IHotelCategoryItemService.class
 org\jeecg\modules\hotelorder\controller\HotelOrderController.class
@@ -113,6 +115,7 @@ org\jeecg\common\util\dynamic\db\DynamicDBUtil.class
 org\jeecg\common\util\oConvertUtils.class
 org\jeecg\modules\hotelcategory\service\IHotelCategoryService.class
 org\jeecg\modules\base\mapper\BaseCommonMapper.class
+org\jeecg\modules\hotelorderlog\mapper\HotelOrderLogMapper.class
 org\jeecg\modules\hanHaiMember\controller\HanHaiMemberController.class
 org\jeecg\modules\hotelcategoryitem\mapper\HotelCategoryItemMapper.class
 org\jeecg\config\mybatis\MybatisInterceptor.class
@@ -139,6 +142,7 @@ org\jeecg\modules\hotelconf\controller\HotelConfController.class
 org\jeecg\common\api\dto\message\TemplateMessageDTO.class
 org\jeecg\common\system\vo\SysPermissionDataRuleModel.class
 org\jeecg\common\exception\JeecgBootException.class
+org\jeecg\common\system\util\DateUtils2.class
 org\jeecg\config\RestTemplateConfig.class
 org\jeecg\common\constant\ServiceNameConstants.class
 org\jeecg\config\shiro\JwtToken.class
@@ -181,6 +185,7 @@ org\jeecg\common\util\DateUtils$3.class
 org\jeecg\config\sign\interceptor\SignAuthConfiguration.class
 org\jeecg\config\vo\Shiro.class
 org\jeecg\modules\hotelshoppingcat\service\IHotelShoppingCatService.class
+org\jeecg\modules\hotelorderlog\service\impl\HotelOrderLogServiceImpl.class
 org\jeecg\config\AutoPoiConfig.class
 org\jeecg\config\AutoPoiDictConfig.class
 org\jeecg\common\aspect\UrlMatchEnum.class
@@ -206,6 +211,7 @@ org\jeecg\modules\hanHaiMember\mapper\HanHaiMemberMapper.class
 org\jeecg\modules\hotelcategoryitem\entity\HotelCategoryItem.class
 org\jeecg\modules\hotelshop\service\IHotelShopService.class
 org\jeecg\common\util\dynamic\db\DataSourceCachePool.class
+org\jeecg\modules\hotelorderlog\entity\HotelOrderLog.class
 org\jeecg\common\constant\DataBaseConstant.class
 org\jeecg\modules\hotelnotice\mapper\HotelNoticeMapper.class
 org\jeecg\common\util\BrowserType.class
diff --git a/jeecg-boot-base/jeecg-boot-base-tools/jeecg-boot-base-tools.iml b/jeecg-boot-base/jeecg-boot-base-tools/jeecg-boot-base-tools.iml
deleted file mode 100644
index 4931d60..0000000
--- a/jeecg-boot-base/jeecg-boot-base-tools/jeecg-boot-base-tools.iml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <webroots />
-      </configuration>
-    </facet>
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.9" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.9" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.0" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.29" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.2.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.60" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.60" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.60" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.6.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.6.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.6.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
-    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.1.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.16" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-core:5.3.8" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-crypto:5.3.8" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.6.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.4.8" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:2.4.8" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:9.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.21.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:4.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.11.22" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.11.22" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:4.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.8.4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.22" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.78" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-tools/target/jeecg-boot-base-tools-3.2.0.jar b/jeecg-boot-base/jeecg-boot-base-tools/target/jeecg-boot-base-tools-3.2.0.jar
index 91ff46fc1b44e5942c90f449805a37f744444e3f..ee29dbae95ba8636a53e8be86cc70cb9168859ed 100644
GIT binary patch
delta 755
zcmYk((MwZN90%}o?zwlaEs0@LIipyvhY`5dHqGX0ri2M%NuXkc;_ltOce|U&AlE}l
z|A2Z3q9DYir?7Co1VMY~ArN7`tOp;(#3z*qf~4|%PeBit&+m7Bzu!IQp1ZwCw>N41
zKp#^*gt!T5f1I4FZ()My8y1*J&V4;2;BFd(VR`}HqiwLH26)xhc!he9uhUDADOX@h
ziNR^*B3xFYa7*ccI*ahU<NEIiVmF<oP~Br;o;1DQf5#KGJ$4<nxGH-}YDAouFRLNA
zp?1Nu+K}igKhR!L1TA$-ZUk$`_T|b4UxoP&dxj52R__0#gnVLz#JNv7S1vdD6*PZ7
zaUg?g)1sUzHiul88hRg`wG~2+YJ?>CSS-LD=X7~DP?Q5k@P`L|Mc0$J?+78k4xel2
zOPWXc^Y8{Xn2vm52nJ*Q#}O>`o@zi)8ST_WurhubujGk|ReamGi6{)EuZlX)rd#2Q
zw7l(FI)S`VzagBr{Jf-}$I?q(Uf+)1hrG?`fe(!?_|fQw-poz-I^*Y4nfTxMmT=x2
zl=%6i*)A)ltXL_WtJ~^;GuCZbvodH)*`sj5?uYyK9oU<d_0{Yc@{>9IJ3f^gL0-+>
kg<;2l&zy1i+p%FTuftkC3wsI!@M%HLe=p>b8<UUz0CooJ{r~^~

delta 755
zcmY+>&1(}u7zXf}o!uA{iv%rxL{VbXLJ&+eN&QHxsV!0qrM3t)RHUWZ&F&_f)Dp1q
zVEZ4meG!U+h!#&$rRhZw%)x^oLcGL7k41~8wum5D)b2AL^sxNiXWn;qmzni7zP`qr
z2Kt2RW6aCg!tMB6Q;TqkzW`s3xsaEKVU(YQw|G0Os3EG`8r8TD`2#-#g>nI=l?0qp
zPQxW74nHgBp)O)nbUgq60_h@+?xu)Rr|I|q^Lw-@E~A%J<xEA5Aup*BxT<!+<Jz!m
z^{)1eqiET+=tc2<@0MJ76R3&6&diPN%<`R|oUwO;u_OhQ6V+;SP{HuW1KYBwAATZt
zm5)R`*fsn*JZmeA?a>%Z(P$z>j&roS5h}|KM)-#hb7jx{m#-LOzjmHWnCmom)5GX0
zJ}?#gBv1?``uC$)>^-y(MQx-*6CGyT^4K}Nl2YR<ZiBv!%TtVGFCyo&r{JTkJncp{
zh1{%Pah<n<RMA_p^i-F}_f_vhZZ~@1J);Z0HM*fccNIR*1!*#u{99jhoi~RhL7Fhn
z%8n^Jmb{a0OWy8`HHdb@%E7cf0w3G`aLc|9d-Jltk{?ArSis%UWFdoGFWiJt$AAx<
fG5FiDVWFtQMllb2N&|4AlyT3GzL$!~#>Dg=w>t)r

diff --git a/jeecg-boot-base/jeecg-boot-base.iml b/jeecg-boot-base/jeecg-boot-base.iml
deleted file mode 100644
index 9dbf17b..0000000
--- a/jeecg-boot-base/jeecg-boot-base.iml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-context:5.3.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-aop:5.3.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-beans:5.3.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-expression:5.3.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.2.9" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.9" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apache.logging.log4j:log4j-api:2.17.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.29" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.6.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.4.8" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:2.4.8" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:9.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.21.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:4.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.11.22" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.11.22" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:4.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-core:5.3.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-jcl:5.3.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.8.4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.22" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.78" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/jeecg-boot-module-system/jeecg-boot-module-system.iml b/jeecg-boot-module-system/jeecg-boot-module-system.iml
deleted file mode 100644
index eab29e7..0000000
--- a/jeecg-boot-module-system/jeecg-boot-module-system.iml
+++ /dev/null
@@ -1,345 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <webroots />
-        <sourceRoots>
-          <root url="file://$MODULE_DIR$/src/main/java" />
-          <root url="file://$MODULE_DIR$/src/main/resources" />
-        </sourceRoots>
-      </configuration>
-    </facet>
-    <facet type="jpa" name="JPA">
-      <configuration>
-        <setting name="validation-enabled" value="true" />
-        <setting name="provider-name" value="Hibernate" />
-        <datasource-mapping>
-          <factory-entry name="jeecg-boot-module-system" />
-        </datasource-mapping>
-        <naming-strategy-map />
-      </configuration>
-    </facet>
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="jeecg-system-local-api" />
-    <orderEntry type="module" module-name="jeecg-boot-base-core" />
-    <orderEntry type="module" module-name="jeecg-boot-base-tools" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.6.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.6.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.6.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.1.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.75.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.16" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-core:5.3.8" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-crypto:5.3.8" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-mail:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.mail:jakarta.mail:1.6.7" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.8.4" level="project" />
-    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.12" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.60" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.2.3.Final" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
-    <orderEntry type="library" name="Maven: io.micrometer:micrometer-registry-prometheus:1.8.4" level="project" />
-    <orderEntry type="library" name="Maven: io.prometheus:simpleclient_common:0.12.0" level="project" />
-    <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.12.0" level="project" />
-    <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_otel:0.12.0" level="project" />
-    <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_common:0.12.0" level="project" />
-    <orderEntry type="library" name="Maven: io.prometheus:simpleclient_tracer_otel_agent:0.12.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.9" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.22" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:dynamic-datasource-spring-boot-starter:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.6.7.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.3.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.persistence:javax.persistence-api:2.2" level="project" />
-    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss:jandex:2.4.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.1.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.6" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jaxb:txw2:2.3.6" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:3.0.12" level="project" />
-    <orderEntry type="library" name="Maven: org.jeecgframework.boot:hibernate-re:3.2.0-beta" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.28" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.microsoft.sqlserver:sqljdbc4:4.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.oracle:ojdbc6:11.2.0.3" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.postgresql:postgresql:42.2.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-quartz:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" />
-    <orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.15" level="project" />
-    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.11.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring-boot-starter:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.owasp.encoder:encoder:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.crazycake:shiro-redis:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-starter:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.classgraph:classgraph:4.8.83" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webflux:3.0.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webmvc:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-oas:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models:2.1.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-core:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-boot-starter:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-data-rest:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-ui:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.jeecgframework.boot:codegenerate:1.3.8" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
-    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-dysmsapi:2.1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.xkcoding.justauth:justauth-spring-boot-starter:1.3.4" level="project" />
-    <orderEntry type="library" name="Maven: me.zhyd.oauth:JustAuth:1.15.7" level="project" />
-    <orderEntry type="library" name="Maven: com.xkcoding.http:simple-http:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:4.4.1" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okio:okio:2.4.3" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.6.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-kotlin:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.6.10" level="project" />
-    <orderEntry type="library" name="Maven: bouncycastle:bcprov-jdk14:138" level="project" />
-    <orderEntry type="library" name="Maven: org.jeecgframework:jeewx-api:1.4.7" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.6" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
-    <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" />
-    <orderEntry type="library" name="Maven: com.google.zxing:javase:3.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.beust:jcommander:1.72" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jai-imageio:jai-imageio-core:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.alipay.sdk:alipay-sdk-java:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.jeecgframework.jimureport:jimureport-spring-boot-starter:1.5.0-beta" level="project" />
-    <orderEntry type="library" name="Maven: org.jeecgframework:minidao-spring-boot-starter:1.9.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.jeecgframework:minidao-pe:1.9.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.9.7" level="project" />
-    <orderEntry type="library" name="Maven: ognl:ognl:3.2.21" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.25.0-GA" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.3" level="project" />
-    <orderEntry type="library" name="Maven: org.jeecgframework:autopoi-web:1.3.9" level="project" />
-    <orderEntry type="library" name="Maven: org.jeecgframework:autopoi:1.3.9" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
-    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.3.04" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-scratchpad:4.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:ooxml-schemas:1.4" level="project" />
-    <orderEntry type="library" name="Maven: com.google.zxing:core:3.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.22" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun.oss:aliyun-sdk-oss:3.11.2" level="project" />
-    <orderEntry type="library" name="Maven: org.jdom:jdom2:2.0.6.1" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.1" level="project" />
-    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ram:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-kms:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: io.minio:minio:8.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.2.2" level="project" />
-    <orderEntry type="library" name="Maven: com.itextpdf:io:7.1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.itextpdf:layout:7.1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.itextpdf:kernel:7.1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.itextpdf:forms:7.1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.itextpdf:pdfa:7.1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.lowagie:itext-rtf:2.1.7" level="project" />
-    <orderEntry type="library" name="Maven: bouncycastle:bcmail-jdk14:138" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bctsp-jdk14:1.38" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk14:1.38" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcmail-jdk14:1.38" level="project" />
-    <orderEntry type="library" name="Maven: com.lowagie:itext:2.1.7" level="project" />
-    <orderEntry type="library" name="Maven: com.googlecode.aviator:aviator:5.2.6" level="project" />
-    <orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-sync:4.4.2" level="project" />
-    <orderEntry type="library" name="Maven: org.mongodb:bson:4.4.2" level="project" />
-    <orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-core:4.4.2" level="project" />
-    <orderEntry type="library" name="Maven: redis.clients:jedis:3.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: org.jeecgframework.jimureport:jimureport-font:1.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.15" level="project" />
-    <orderEntry type="library" name="Maven: com.github.liyiorg:weixin-popular:2.8.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.13" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.1.12" level="project" />
-    <orderEntry type="library" name="Maven: com.vdurmont:emoji-java:3.1.3" level="project" />
-    <orderEntry type="library" name="Maven: org.json:json:20140107" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.24" level="project" />
-    <orderEntry type="module" module-name="han-hai-module-pay" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.60" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.60" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.5.3" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.jacoco:org.jacoco.agent:runtime:0.8.5" level="project" />
-    <orderEntry type="library" name="Maven: org.ini4j:ini4j:0.5.4" level="project" />
-    <orderEntry type="library" name="Maven: io.opentracing:opentracing-api:0.33.0" level="project" />
-    <orderEntry type="library" name="Maven: io.opentracing:opentracing-util:0.33.0" level="project" />
-    <orderEntry type="library" name="Maven: io.opentracing:opentracing-noop:0.33.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-pay:3.5.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-common:3.5.0" level="project" />
-    <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.11" level="project" />
-    <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.36" level="project" />
-    <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.binarywang:qrcode-utils:1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.jodd:jodd-http:3.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.jodd:jodd-core:3.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.jodd:jodd-upload:3.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.59" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.59" level="project" />
-    <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-miniapp:3.5.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-mp:3.5.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.9" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.9" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.0" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.29" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.6.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.6.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.4.8" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:2.4.8" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:9.1" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.21.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.8.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:4.0.0" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.11.22" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.11.22" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:4.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.8.4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.78" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/service/impl/OrderServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/service/impl/OrderServiceImpl.java
index d153c01..ec5984a 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/service/impl/OrderServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/service/impl/OrderServiceImpl.java
@@ -437,6 +437,7 @@ public class OrderServiceImpl implements IOrderService {
                     hotelLeaseLog.setGoodsId(hotelOrder.getGoodsId());
                     hotelLeaseLog.setSkuId(hotelOrder.getSkuId());
                     hotelLeaseLog.setGoodsName(hotelOrder.getGoodsName());
+                    hotelLeaseLog.setGoodsPic(hotelOrder.getPic());
                     hotelLeaseLog.setSku(hotelOrder.getSku());
                     hotelLeaseLog.setStatus(0);
                     hotelLeaseLog.setNum(hotelOrder.getNum());
@@ -449,6 +450,7 @@ public class OrderServiceImpl implements IOrderService {
                     hotelLeaseLog.setGoodsId(hotelOrder.getGoodsId());
                     hotelLeaseLog.setSkuId(hotelOrder.getSkuId());
                     hotelLeaseLog.setGoodsName(hotelOrder.getGoodsName());
+                    hotelLeaseLog.setGoodsPic(hotelOrder.getPic());
                     hotelLeaseLog.setSku(hotelOrder.getSku());
                     hotelLeaseLog.setStatus(0);
                     hotelLeaseLog.setNum(hotelOrder.getNum());