From a4b6392e19560dc4a0384193d7fa881fd8e09658 Mon Sep 17 00:00:00 2001
From: lzx_mac <2602107437@qq.com>
Date: Wed, 4 Sep 2024 11:44:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=A5=E5=8F=A3=E6=95=B4?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin-hanhai-vue/.env                              |   2 +-
 admin-hanhai-vue/public/index.html                 |   4 +-
 .../src/components/layouts/UserLayout.vue          |   2 +-
 .../src/components/page/GlobalHeader.vue           |   4 +-
 admin-hanhai-vue/src/components/tools/Logo.vue     |   2 +-
 .../target/jeecg-system-cloud-api-3.2.0.jar        | Bin 9841 -> 9841 bytes
 .../target/jeecg-system-local-api-3.2.0.jar        | Bin 3832 -> 3832 bytes
 .../cheerConf/controller/CheerConfController.java  | 171 ----------
 .../jeecg/modules/cheerConf/entity/CheerConf.java  |  62 ----
 .../modules/cheerConf/mapper/CheerConfMapper.java  |  17 -
 .../cheerConf/mapper/xml/CheerConfMapper.xml       |   5 -
 .../cheerConf/service/ICheerConfService.java       |  14 -
 .../service/impl/CheerConfServiceImpl.java         |  19 --
 .../jeecg/modules/cheerConf/vue/CheerConfList.vue  | 183 -----------
 .../cheerConf/vue/modules/CheerConfForm.vue        | 114 -------
 .../vue/modules/CheerConfModal.Style#Drawer.vue    |  84 -----
 .../cheerConf/vue/modules/CheerConfModal.vue       |  60 ----
 .../jeecg/modules/cheerConf/vue3/CheerConf.api.ts  |  61 ----
 .../jeecg/modules/cheerConf/vue3/CheerConf.data.ts |  43 ---
 .../jeecg/modules/cheerConf/vue3/CheerConfList.vue | 162 ----------
 .../cheerConf/vue3/components/CheerConfModal.vue   |  58 ----
 .../controller/CheerRechargeController.java        | 171 ----------
 .../cheerRecharge/entity/CheerRecharge.java        |  54 ----
 .../cheerRecharge/mapper/CheerRechargeMapper.java  |  17 -
 .../mapper/xml/CheerRechargeMapper.xml             |   5 -
 .../service/ICheerRechargeService.java             |  14 -
 .../service/impl/CheerRechargeServiceImpl.java     |  19 --
 .../cheerRecharge/vue/CheerRechargeList.vue        | 171 ----------
 .../vue/modules/CheerRechargeForm.vue              | 104 ------
 .../modules/CheerRechargeModal.Style#Drawer.vue    |  84 -----
 .../vue/modules/CheerRechargeModal.vue             |  60 ----
 .../cheerRecharge/vue3/CheerRecharge.api.ts        |  61 ----
 .../cheerRecharge/vue3/CheerRecharge.data.ts       |  23 --
 .../cheerRecharge/vue3/CheerRechargeList.vue       | 162 ----------
 .../vue3/components/CheerRechargeModal.vue         |  58 ----
 .../controller/CheerWaterController.java           | 171 ----------
 .../modules/cheerWater/entity/CheerWater.java      |  71 -----
 .../cheerWater/mapper/CheerWaterMapper.java        |  17 -
 .../cheerWater/mapper/xml/CheerWaterMapper.xml     |   5 -
 .../cheerWater/service/ICheerWaterService.java     |  14 -
 .../service/impl/CheerWaterServiceImpl.java        |  19 --
 .../modules/cheerWater/vue/CheerWaterList.vue      | 203 ------------
 .../cheerWater/vue/modules/CheerWaterForm.vue      | 124 --------
 .../vue/modules/CheerWaterModal.Style#Drawer.vue   |  84 -----
 .../cheerWater/vue/modules/CheerWaterModal.vue     |  60 ----
 .../modules/cheerWater/vue3/CheerWater.api.ts      |  61 ----
 .../modules/cheerWater/vue3/CheerWater.data.ts     |  72 -----
 .../modules/cheerWater/vue3/CheerWaterList.vue     | 162 ----------
 .../cheerWater/vue3/components/CheerWaterModal.vue |  58 ----
 .../payOrder/controller/PayOrderController.java    | 171 ----------
 .../jeecg/modules/payOrder/entity/PayOrder.java    |  74 -----
 .../modules/payOrder/mapper/PayOrderMapper.java    |  17 -
 .../modules/payOrder/mapper/xml/PayOrderMapper.xml |   5 -
 .../modules/payOrder/service/IPayOrderService.java |  14 -
 .../payOrder/service/impl/PayOrderServiceImpl.java |  19 --
 .../jeecg/modules/payOrder/vue/PayOrderList.vue    | 201 ------------
 .../modules/payOrder/vue/modules/PayOrderForm.vue  | 129 --------
 .../vue/modules/PayOrderModal.Style#Drawer.vue     |  84 -----
 .../modules/payOrder/vue/modules/PayOrderModal.vue |  60 ----
 .../jeecg/modules/payOrder/vue3/PayOrder.api.ts    |  61 ----
 .../jeecg/modules/payOrder/vue3/PayOrder.data.ts   |  73 -----
 .../jeecg/modules/payOrder/vue3/PayOrderList.vue   | 162 ----------
 .../payOrder/vue3/components/PayOrderModal.vue     |  58 ----
 .../payShop/controller/PayShopController.java      | 171 ----------
 .../org/jeecg/modules/payShop/entity/PayShop.java  |  86 -----
 .../modules/payShop/mapper/PayShopMapper.java      |  17 -
 .../modules/payShop/mapper/xml/PayShopMapper.xml   |   5 -
 .../modules/payShop/service/IPayShopService.java   |  14 -
 .../payShop/service/impl/PayShopServiceImpl.java   |  19 --
 .../org/jeecg/modules/payShop/vue/PayShopList.vue  | 215 -------------
 .../modules/payShop/vue/modules/PayShopForm.vue    | 144 ---------
 .../vue/modules/PayShopModal.Style#Drawer.vue      |  84 -----
 .../modules/payShop/vue/modules/PayShopModal.vue   |  60 ----
 .../org/jeecg/modules/payShop/vue3/PayShop.api.ts  |  61 ----
 .../org/jeecg/modules/payShop/vue3/PayShop.data.ts | 101 ------
 .../org/jeecg/modules/payShop/vue3/PayShopList.vue | 162 ----------
 .../payShop/vue3/components/PayShopModal.vue       |  58 ----
 .../controller/ShcoolFloorController.java          | 229 -------------
 .../modules/shcoolFloor/entity/ShcoolFloor.java    |  63 ----
 .../shcoolFloor/mapper/ShcoolFloorMapper.java      |  22 --
 .../shcoolFloor/mapper/xml/ShcoolFloorMapper.xml   |   9 -
 .../shcoolFloor/service/IShcoolFloorService.java   |  38 ---
 .../service/impl/ShcoolFloorServiceImpl.java       | 191 -----------
 .../modules/shcoolFloor/vue/ShcoolFloorList.vue    | 353 ---------------------
 .../shcoolFloor/vue/modules/ShcoolFloorModal.vue   | 156 ---------
 .../modules/shcoolFloor/vue3/ShcoolFloor.api.ts    |  82 -----
 .../modules/shcoolFloor/vue3/ShcoolFloor.data.ts   |  38 ---
 .../modules/shcoolFloor/vue3/ShcoolFloorList.vue   | 272 ----------------
 .../vue3/components/ShcoolFloorModal.vue           |  87 -----
 .../shcoolSub/controller/ShcoolSubController.java  | 171 ----------
 .../jeecg/modules/shcoolSub/entity/ShcoolSub.java  | 110 -------
 .../modules/shcoolSub/mapper/ShcoolSubMapper.java  |  17 -
 .../shcoolSub/mapper/xml/ShcoolSubMapper.xml       |   5 -
 .../shcoolSub/service/IShcoolSubService.java       |  14 -
 .../service/impl/ShcoolSubServiceImpl.java         |  19 --
 .../jeecg/modules/shcoolSub/vue/ShcoolSubList.vue  | 256 ---------------
 .../shcoolSub/vue/modules/ShcoolSubForm.vue        | 174 ----------
 .../vue/modules/ShcoolSubModal.Style#Drawer.vue    |  84 -----
 .../shcoolSub/vue/modules/ShcoolSubModal.vue       |  60 ----
 .../jeecg/modules/shcoolSub/vue3/ShcoolSub.api.ts  |  61 ----
 .../jeecg/modules/shcoolSub/vue3/ShcoolSub.data.ts | 166 ----------
 .../jeecg/modules/shcoolSub/vue3/ShcoolSubList.vue | 162 ----------
 .../shcoolSub/vue3/components/ShcoolSubModal.vue   |  58 ----
 .../cheerConf/controller/CheerConfController.class | Bin 7226 -> 0 bytes
 .../jeecg/modules/cheerConf/entity/CheerConf.class | Bin 5669 -> 0 bytes
 .../modules/cheerConf/mapper/CheerConfMapper.class | Bin 339 -> 0 bytes
 .../cheerConf/mapper/xml/CheerConfMapper.xml       |   5 -
 .../cheerConf/service/ICheerConfService.class      | Bin 352 -> 0 bytes
 .../service/impl/CheerConfServiceImpl.class        | Bin 793 -> 0 bytes
 .../controller/CheerRechargeController.class       | Bin 7411 -> 0 bytes
 .../cheerRecharge/entity/CheerRecharge.class       | Bin 4815 -> 0 bytes
 .../cheerRecharge/mapper/CheerRechargeMapper.class | Bin 359 -> 0 bytes
 .../mapper/xml/CheerRechargeMapper.xml             |   5 -
 .../service/ICheerRechargeService.class            | Bin 372 -> 0 bytes
 .../service/impl/CheerRechargeServiceImpl.class    | Bin 845 -> 0 bytes
 .../controller/CheerWaterController.class          | Bin 7309 -> 0 bytes
 .../modules/cheerWater/entity/CheerWater.class     | Bin 6902 -> 0 bytes
 .../cheerWater/mapper/CheerWaterMapper.class       | Bin 344 -> 0 bytes
 .../cheerWater/mapper/xml/CheerWaterMapper.xml     |   5 -
 .../cheerWater/service/ICheerWaterService.class    | Bin 357 -> 0 bytes
 .../service/impl/CheerWaterServiceImpl.class       | Bin 806 -> 0 bytes
 .../payOrder/controller/PayOrderController.class   | Bin 7269 -> 0 bytes
 .../jeecg/modules/payOrder/entity/PayOrder.class   | Bin 7335 -> 0 bytes
 .../modules/payOrder/mapper/PayOrderMapper.class   | Bin 334 -> 0 bytes
 .../modules/payOrder/mapper/xml/PayOrderMapper.xml |   5 -
 .../payOrder/service/IPayOrderService.class        | Bin 347 -> 0 bytes
 .../service/impl/PayOrderServiceImpl.class         | Bin 780 -> 0 bytes
 .../payShop/controller/PayShopController.class     | Bin 7228 -> 0 bytes
 .../org/jeecg/modules/payShop/entity/PayShop.class | Bin 8869 -> 0 bytes
 .../modules/payShop/mapper/PayShopMapper.class     | Bin 329 -> 0 bytes
 .../modules/payShop/mapper/xml/PayShopMapper.xml   |   5 -
 .../modules/payShop/service/IPayShopService.class  | Bin 342 -> 0 bytes
 .../payShop/service/impl/PayShopServiceImpl.class  | Bin 767 -> 0 bytes
 .../controller/ShcoolFloorController.class         | Bin 10162 -> 0 bytes
 .../modules/shcoolFloor/entity/ShcoolFloor.class   | Bin 6151 -> 0 bytes
 .../shcoolFloor/mapper/ShcoolFloorMapper.class     | Bin 584 -> 0 bytes
 .../shcoolFloor/mapper/xml/ShcoolFloorMapper.xml   |   9 -
 .../shcoolFloor/service/IShcoolFloorService.class  | Bin 1147 -> 0 bytes
 .../service/impl/ShcoolFloorServiceImpl.class      | Bin 5191 -> 0 bytes
 .../shcoolSub/controller/ShcoolSubController.class | Bin 7226 -> 0 bytes
 .../jeecg/modules/shcoolSub/entity/ShcoolSub.class | Bin 12330 -> 0 bytes
 .../modules/shcoolSub/mapper/ShcoolSubMapper.class | Bin 339 -> 0 bytes
 .../shcoolSub/mapper/xml/ShcoolSubMapper.xml       |   5 -
 .../shcoolSub/service/IShcoolSubService.class      | Bin 352 -> 0 bytes
 .../service/impl/ShcoolSubServiceImpl.class        | Bin 793 -> 0 bytes
 .../target/jeecg-boot-base-core-3.2.0.jar          | Bin 506926 -> 518848 bytes
 .../compile/default-compile/createdFiles.lst       |   5 +
 .../compile/default-compile/inputFiles.lst         |   5 +
 .../target/jeecg-boot-base-tools-3.2.0.jar         | Bin 29154 -> 29154 bytes
 .../api/cheeroncontroller/CheerInfoController.java | 101 ------
 .../cheeroncontroller/CheerLoginApiController.java |  50 ---
 .../noticeapicontroller/LoginApiController.java    |  23 --
 .../api/payController/PayApiIndexController.java   |  84 -----
 .../api/payController/PayLoginController.java      |  51 ---
 .../api/schoolcontroller/SchoolApiController.java  |  77 -----
 .../schoolcontroller/SchoolLoginController.java    |  58 ----
 .../jeecg/modules/apiservice/IndexApiService.java  |  40 ---
 .../jeecg/modules/apiservice/InfoApiService.java   |  18 --
 .../jeecg/modules/apiservice/LoginApiService.java  |  13 -
 .../apiservice/impl/IndexApiServiceImpl.java       | 201 ------------
 .../apiservice/impl/InfoApiServiceImpl.java        | 158 ---------
 .../apiservice/impl/LoginApiServiceImpl.java       |  56 ----
 162 files changed, 17 insertions(+), 9375 deletions(-)
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/controller/CheerConfController.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/entity/CheerConf.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/mapper/CheerConfMapper.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/mapper/xml/CheerConfMapper.xml
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/service/ICheerConfService.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/service/impl/CheerConfServiceImpl.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue/CheerConfList.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue/modules/CheerConfForm.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue/modules/CheerConfModal.Style#Drawer.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue/modules/CheerConfModal.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue3/CheerConf.api.ts
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue3/CheerConf.data.ts
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue3/CheerConfList.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue3/components/CheerConfModal.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/controller/CheerRechargeController.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/entity/CheerRecharge.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/mapper/CheerRechargeMapper.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/mapper/xml/CheerRechargeMapper.xml
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/service/ICheerRechargeService.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/service/impl/CheerRechargeServiceImpl.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/CheerRechargeList.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/modules/CheerRechargeForm.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/modules/CheerRechargeModal.Style#Drawer.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/modules/CheerRechargeModal.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/CheerRecharge.api.ts
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/CheerRecharge.data.ts
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/CheerRechargeList.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/components/CheerRechargeModal.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/controller/CheerWaterController.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/entity/CheerWater.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/mapper/CheerWaterMapper.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/mapper/xml/CheerWaterMapper.xml
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/service/ICheerWaterService.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/service/impl/CheerWaterServiceImpl.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/CheerWaterList.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/modules/CheerWaterForm.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/modules/CheerWaterModal.Style#Drawer.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/modules/CheerWaterModal.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/CheerWater.api.ts
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/CheerWater.data.ts
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/CheerWaterList.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/components/CheerWaterModal.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/controller/PayOrderController.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/entity/PayOrder.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/mapper/PayOrderMapper.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/mapper/xml/PayOrderMapper.xml
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/service/IPayOrderService.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/service/impl/PayOrderServiceImpl.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue/PayOrderList.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue/modules/PayOrderForm.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue/modules/PayOrderModal.Style#Drawer.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue/modules/PayOrderModal.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue3/PayOrder.api.ts
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue3/PayOrder.data.ts
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue3/PayOrderList.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue3/components/PayOrderModal.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/controller/PayShopController.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/entity/PayShop.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/mapper/PayShopMapper.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/mapper/xml/PayShopMapper.xml
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/service/IPayShopService.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/service/impl/PayShopServiceImpl.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue/PayShopList.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue/modules/PayShopForm.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue/modules/PayShopModal.Style#Drawer.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue/modules/PayShopModal.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue3/PayShop.api.ts
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue3/PayShop.data.ts
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue3/PayShopList.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue3/components/PayShopModal.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/controller/ShcoolFloorController.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/entity/ShcoolFloor.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/mapper/ShcoolFloorMapper.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/mapper/xml/ShcoolFloorMapper.xml
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/service/IShcoolFloorService.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/service/impl/ShcoolFloorServiceImpl.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue/ShcoolFloorList.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue/modules/ShcoolFloorModal.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/ShcoolFloor.api.ts
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/ShcoolFloor.data.ts
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/ShcoolFloorList.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/components/ShcoolFloorModal.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/controller/ShcoolSubController.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/entity/ShcoolSub.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/mapper/ShcoolSubMapper.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/mapper/xml/ShcoolSubMapper.xml
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/service/IShcoolSubService.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/service/impl/ShcoolSubServiceImpl.java
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/ShcoolSubList.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/modules/ShcoolSubForm.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/modules/ShcoolSubModal.Style#Drawer.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/modules/ShcoolSubModal.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/ShcoolSub.api.ts
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/ShcoolSub.data.ts
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/ShcoolSubList.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/components/ShcoolSubModal.vue
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/controller/CheerConfController.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/entity/CheerConf.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/mapper/CheerConfMapper.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/mapper/xml/CheerConfMapper.xml
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/service/ICheerConfService.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/service/impl/CheerConfServiceImpl.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/controller/CheerRechargeController.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/entity/CheerRecharge.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/mapper/CheerRechargeMapper.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/mapper/xml/CheerRechargeMapper.xml
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/service/ICheerRechargeService.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/service/impl/CheerRechargeServiceImpl.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/controller/CheerWaterController.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/entity/CheerWater.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/mapper/CheerWaterMapper.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/mapper/xml/CheerWaterMapper.xml
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/service/ICheerWaterService.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/service/impl/CheerWaterServiceImpl.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/controller/PayOrderController.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/entity/PayOrder.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/mapper/PayOrderMapper.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/mapper/xml/PayOrderMapper.xml
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/service/IPayOrderService.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/service/impl/PayOrderServiceImpl.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/controller/PayShopController.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/entity/PayShop.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/mapper/PayShopMapper.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/mapper/xml/PayShopMapper.xml
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/service/IPayShopService.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/service/impl/PayShopServiceImpl.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/controller/ShcoolFloorController.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/entity/ShcoolFloor.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/mapper/ShcoolFloorMapper.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/mapper/xml/ShcoolFloorMapper.xml
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/service/IShcoolFloorService.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/service/impl/ShcoolFloorServiceImpl.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/controller/ShcoolSubController.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/entity/ShcoolSub.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/mapper/ShcoolSubMapper.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/mapper/xml/ShcoolSubMapper.xml
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/service/IShcoolSubService.class
 delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/service/impl/ShcoolSubServiceImpl.class
 delete mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/cheeroncontroller/CheerInfoController.java
 delete mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/cheeroncontroller/CheerLoginApiController.java
 delete mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/payController/PayApiIndexController.java
 delete mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/payController/PayLoginController.java
 delete mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/schoolcontroller/SchoolApiController.java
 delete mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/schoolcontroller/SchoolLoginController.java

diff --git a/admin-hanhai-vue/.env b/admin-hanhai-vue/.env
index 66bd357..30b0439 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/public/index.html b/admin-hanhai-vue/public/index.html
index f844672..a5958a2 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/components/layouts/UserLayout.vue b/admin-hanhai-vue/src/components/layouts/UserLayout.vue
index 6f83708..a385370 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 ae3af5a..a5c891b 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 207ec70..931b850 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/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 de522036bc52b44b43212db0bb34dc14fee77d91..60ef47202f8bea2d2a36e03c59895d442a433fec 100644
GIT binary patch
delta 270
zcmez9^U;Slz?+$ci-CcIfkDGdWg@Q%Gl()-&#Vrlp2>r#$sCNTVA_CD2TaE^8iVPn
zjOJkaJfj1c7Gkmo>7E?Iqy?rMnVi7%F{Vh6{AML)ZeB3MK;SSpnDI^8kp-;PN?{9F
z=|=?<Fs-3z4;If-)CbdZ6ivbO6-65`Ev)1WrX!Wy!SrIK05JVc$serWL)i*Uw<-sL
b>08Q~V0kx{3^2V>B?3(Is6GVKA5<FwaP>rm

delta 270
zcmez9^U;Slz?+$ci-CcIfuSrzaU!n@Gl()-&s++mp2>r#$sCNTVA_CD2TaE^8iVPn
zjOJkaJfj1c7Gkmo>7E?Iqy?rMnVi7%F{Vh6{AML)ZeB3MK;SSpnDI^8kp-;PN?{9F
z=|=?<Fs-3z4;If-)CbdZ6ivbO6-65`Ev)1WrX!Wy!SrIK05JVc$serWL)i*Uw<-sL
b>08Q~V0kx{3^2V>B?3(Is6GVKA5<FwG=fp3

diff --git a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/jeecg-system-local-api-3.2.0.jar b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/jeecg-system-local-api-3.2.0.jar
index 109627c34ae985eaa0787e7c190a4799a30252a2..488ad79d8f2e13a0bc34a46bcd405571a9a94fa5 100644
GIT binary patch
delta 204
zcmew%`$LvDz?+$ci-CcIfkE9%Wg@Q%Gl(+Tz^n$Op38%%$()R;VA_yT2TUh08iVO+
zjOHNKlP@r8f$6`DPGH)JDH0^Vc^=b3cCbPxt}S4RpIjzj+JM_0EMCN|52lxJn}X>(
o+%{lZn#UPTC-S(1)vxBU0@E*eg21#bZzfoNCGTl4UC!4C0Hv@q8UO$Q

delta 204
zcmew%`$LvDz?+$ci-CcIfuS@*aU!n@Gl(+T0H&VHgQ&@zjH+PTkWmLrComd=>1mAS
zVEO{17MT9a=me&nm?A;+=6OsD*&za4Tfp>BE)y_qz-<qvi@5c{^b&4UFnx#H224xy
iID_d#9(ORkn#T%Ezu*Z1)3&^sV0tC*X)s;R*9ZW4h&=!R

diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/controller/CheerConfController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/controller/CheerConfController.java
deleted file mode 100644
index 6311d8d..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/controller/CheerConfController.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package org.jeecg.modules.cheerConf.controller;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.cheerConf.entity.CheerConf;
-import org.jeecg.modules.cheerConf.service.ICheerConfService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-
- /**
- * @Description: 配置表
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-@Api(tags="配置表")
-@RestController
-@RequestMapping("/cheerConf/cheerConf")
-@Slf4j
-public class CheerConfController extends JeecgController<CheerConf, ICheerConfService> {
-	@Autowired
-	private ICheerConfService cheerConfService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param cheerConf
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "配置表-分页列表查询")
-	@ApiOperation(value="配置表-分页列表查询", notes="配置表-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<CheerConf>> queryPageList(CheerConf cheerConf,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<CheerConf> queryWrapper = QueryGenerator.initQueryWrapper(cheerConf, req.getParameterMap());
-		Page<CheerConf> page = new Page<CheerConf>(pageNo, pageSize);
-		IPage<CheerConf> pageList = cheerConfService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	
-	/**
-	 *   添加
-	 *
-	 * @param cheerConf
-	 * @return
-	 */
-	@AutoLog(value = "配置表-添加")
-	@ApiOperation(value="配置表-添加", notes="配置表-添加")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody CheerConf cheerConf) {
-		cheerConfService.save(cheerConf);
-		return Result.OK("添加成功！");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param cheerConf
-	 * @return
-	 */
-	@AutoLog(value = "配置表-编辑")
-	@ApiOperation(value="配置表-编辑", notes="配置表-编辑")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody CheerConf cheerConf) {
-		cheerConfService.updateById(cheerConf);
-		return Result.OK("编辑成功!");
-	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "配置表-通过id删除")
-	@ApiOperation(value="配置表-通过id删除", notes="配置表-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		cheerConfService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "配置表-批量删除")
-	@ApiOperation(value="配置表-批量删除", notes="配置表-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.cheerConfService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-	
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "配置表-通过id查询")
-	@ApiOperation(value="配置表-通过id查询", notes="配置表-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<CheerConf> queryById(@RequestParam(name="id",required=true) String id) {
-		CheerConf cheerConf = cheerConfService.getById(id);
-		if(cheerConf==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(cheerConf);
-	}
-
-    /**
-    * 导出excel
-    *
-    * @param request
-    * @param cheerConf
-    */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, CheerConf cheerConf) {
-        return super.exportXls(request, cheerConf, CheerConf.class, "配置表");
-    }
-
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, CheerConf.class);
-    }
-
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/entity/CheerConf.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/entity/CheerConf.java
deleted file mode 100644
index 4266dea..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/entity/CheerConf.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.jeecg.modules.cheerConf.entity;
-
-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.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @Description: 配置表
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-@Data
-@TableName("cheer_conf")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="cheer_conf对象", description="配置表")
-public class CheerConf implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "主键")
-    private java.lang.String id;
-	/**创建人*/
-    @ApiModelProperty(value = "创建人")
-    private java.lang.String createBy;
-	/**创建日期*/
-    @ApiModelProperty(value = "创建日期")
-    private java.util.Date createTime;
-	/**更新人*/
-    @ApiModelProperty(value = "更新人")
-    private java.lang.String updateBy;
-	/**更新日期*/
-    @ApiModelProperty(value = "更新日期")
-    private java.util.Date updateTime;
-	/**键*/
-	@Excel(name = "键", width = 15)
-    @ApiModelProperty(value = "键")
-    private java.lang.String keyValue;
-	/**说明*/
-	@Excel(name = "说明", width = 15)
-    @ApiModelProperty(value = "说明")
-    private java.lang.String keyTitle;
-	/**内容*/
-	@Excel(name = "内容", width = 15)
-    @ApiModelProperty(value = "内容")
-    private java.lang.String keyCentent;
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/mapper/CheerConfMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/mapper/CheerConfMapper.java
deleted file mode 100644
index a40657f..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/mapper/CheerConfMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.jeecg.modules.cheerConf.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.cheerConf.entity.CheerConf;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 配置表
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-public interface CheerConfMapper extends BaseMapper<CheerConf> {
-
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/mapper/xml/CheerConfMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/mapper/xml/CheerConfMapper.xml
deleted file mode 100644
index 6e16809..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/mapper/xml/CheerConfMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.cheerConf.mapper.CheerConfMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/service/ICheerConfService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/service/ICheerConfService.java
deleted file mode 100644
index a0ee87f..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/service/ICheerConfService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.jeecg.modules.cheerConf.service;
-
-import org.jeecg.modules.cheerConf.entity.CheerConf;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 配置表
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-public interface ICheerConfService extends IService<CheerConf> {
-
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/service/impl/CheerConfServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/service/impl/CheerConfServiceImpl.java
deleted file mode 100644
index 5a9942b..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/service/impl/CheerConfServiceImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.jeecg.modules.cheerConf.service.impl;
-
-import org.jeecg.modules.cheerConf.entity.CheerConf;
-import org.jeecg.modules.cheerConf.mapper.CheerConfMapper;
-import org.jeecg.modules.cheerConf.service.ICheerConfService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 配置表
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-@Service
-public class CheerConfServiceImpl extends ServiceImpl<CheerConfMapper, CheerConf> implements ICheerConfService {
-
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue/CheerConfList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue/CheerConfList.vue
deleted file mode 100644
index f2edd1b..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue/CheerConfList.vue
+++ /dev/null
@@ -1,183 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 查询区域-END -->
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <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>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        :scroll="{x:true}"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
-
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-
-    <cheer-conf-modal ref="modalForm" @ok="modalFormOk"></cheer-conf-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import CheerConfModal from './modules/CheerConfModal'
-
-  export default {
-    name: 'CheerConfList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      CheerConfModal
-    },
-    data () {
-      return {
-        description: '配置表管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'键',
-            align:"center",
-            dataIndex: 'keyValue'
-          },
-          {
-            title:'说明',
-            align:"center",
-            dataIndex: 'keyTitle'
-          },
-          {
-            title:'内容',
-            align:"center",
-            dataIndex: 'keyCentent'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: "/cheerConf/cheerConf/list",
-          delete: "/cheerConf/cheerConf/delete",
-          deleteBatch: "/cheerConf/cheerConf/deleteBatch",
-          exportXlsUrl: "/cheerConf/cheerConf/exportXls",
-          importExcelUrl: "cheerConf/cheerConf/importExcel",
-          
-        },
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
-    this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
-    },
-    methods: {
-      initDictConfig(){
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'keyValue',text:'键',dictCode:''})
-        fieldList.push({type:'string',value:'keyTitle',text:'说明',dictCode:''})
-        fieldList.push({type:'string',value:'keyCentent',text:'内容',dictCode:''})
-        this.superFieldList = fieldList
-      }
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue/modules/CheerConfForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue/modules/CheerConfForm.vue
deleted file mode 100644
index 2cd14a4..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue/modules/CheerConfForm.vue
+++ /dev/null
@@ -1,114 +0,0 @@
-<template>
-  <a-spin :spinning="confirmLoading">
-    <j-form-container :disabled="formDisabled">
-      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-        <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="键" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="keyValue">
-              <a-input v-model="model.keyValue" placeholder="请输入键"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="keyTitle">
-              <a-input v-model="model.keyTitle" placeholder="请输入说明"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="内容" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="keyCentent">
-              <a-input v-model="model.keyCentent" placeholder="请输入内容"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </j-form-container>
-  </a-spin>
-</template>
-
-<script>
-
-  import { httpAction, getAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
-
-  export default {
-    name: 'CheerConfForm',
-    components: {
-    },
-    props: {
-      //表单禁用
-      disabled: {
-        type: Boolean,
-        default: false,
-        required: false
-      }
-    },
-    data () {
-      return {
-        model:{
-         },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        validatorRules: {
-        },
-        url: {
-          add: "/cheerConf/cheerConf/add",
-          edit: "/cheerConf/cheerConf/edit",
-          queryById: "/cheerConf/cheerConf/queryById"
-        }
-      }
-    },
-    computed: {
-      formDisabled(){
-        return this.disabled
-      },
-    },
-    created () {
-       //备份model原始值
-      this.modelDefault = JSON.parse(JSON.stringify(this.model));
-    },
-    methods: {
-      add () {
-        this.edit(this.modelDefault);
-      },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
-      },
-      submitForm () {
-        const that = this;
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
-          }
-         
-        })
-      },
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue/modules/CheerConfModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue/modules/CheerConfModal.Style#Drawer.vue
deleted file mode 100644
index 2adcf5f..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue/modules/CheerConfModal.Style#Drawer.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <cheer-conf-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></cheer-conf-form>
-    <div class="drawer-footer">
-      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
-      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-
-  import CheerConfForm from './CheerConfForm'
-
-  export default {
-    name: 'CheerConfModal',
-    components: {
-      CheerConfForm
-    },
-    data () {
-      return {
-        title:"操作",
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        });
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-/** Button按钮间距 */
-  .ant-btn {
-    margin-left: 30px;
-    margin-bottom: 30px;
-    float: right;
-  }
-  .drawer-footer{
-    position: absolute;
-    bottom: -8px;
-    width: 100%;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    left: 0;
-    background: #fff;
-    border-radius: 0 0 2px 2px;
-  }
-</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue/modules/CheerConfModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue/modules/CheerConfModal.vue
deleted file mode 100644
index c9b5de8..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue/modules/CheerConfModal.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <cheer-conf-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cheer-conf-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import CheerConfForm from './CheerConfForm'
-  export default {
-    name: 'CheerConfModal',
-    components: {
-      CheerConfForm
-    },
-    data () {
-      return {
-        title:'',
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue3/CheerConf.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue3/CheerConf.api.ts
deleted file mode 100644
index 0a3a913..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue3/CheerConf.api.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import {defHttp} from '/@/utils/http/axios';
-import {Modal} from 'ant-design-vue';
-
-enum Api {
-  list = '/cheerConf/cheerConf/list',
-  save='/cheerConf/cheerConf/add',
-  edit='/cheerConf/cheerConf/edit',
-  deleteOne = '/cheerConf/cheerConf/delete',
-  deleteBatch = '/cheerConf/cheerConf/deleteBatch',
-  importExcel = '/cheerConf/cheerConf/importExcel',
-  exportXls = '/cheerConf/cheerConf/exportXls',
-}
-/**
- * 导出api
- * @param params
- */
-export const getExportUrl = Api.exportXls;
-/**
- * 导入api
- */
-export const getImportUrl = Api.importExcel;
-/**
- * 列表接口
- * @param params
- */
-export const list = (params) =>
-  defHttp.get({url: Api.list, params});
-
-/**
- * 删除单个
- */
-export const deleteOne = (params,handleSuccess) => {
-  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
-    handleSuccess();
-  });
-}
-/**
- * 批量删除
- * @param params
- */
-export const batchDelete = (params, handleSuccess) => {
-  Modal.confirm({
-    title: '确认删除',
-    content: '是否删除选中数据',
-    okText: '确认',
-    cancelText: '取消',
-    onOk: () => {
-      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
-        handleSuccess();
-      });
-    }
-  });
-}
-/**
- * 保存或者更新
- * @param params
- */
-export const saveOrUpdate = (params, isUpdate) => {
-  let url = isUpdate ? Api.edit : Api.save;
-  return defHttp.post({url: url, params});
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue3/CheerConf.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue3/CheerConf.data.ts
deleted file mode 100644
index 7cca604..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue3/CheerConf.data.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
-import { rules} from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
-//列表数据
-export const columns: BasicColumn[] = [
-    {
-    title: '键',
-    align:"center",
-    dataIndex: 'keyValue'
-   },
-   {
-    title: '说明',
-    align:"center",
-    dataIndex: 'keyTitle'
-   },
-   {
-    title: '内容',
-    align:"center",
-    dataIndex: 'keyCentent'
-   },
-];
-//查询数据
-export const searchFormSchema: FormSchema[] = [
-];
-//表单数据
-export const formSchema: FormSchema[] = [
-  {
-    label: '键',
-    field: 'keyValue',
-    component: 'Input',
-  },
-  {
-    label: '说明',
-    field: 'keyTitle',
-    component: 'Input',
-  },
-  {
-    label: '内容',
-    field: 'keyCentent',
-    component: 'Input',
-  },
-];
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue3/CheerConfList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue3/CheerConfList.vue
deleted file mode 100644
index ab5f457..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue3/CheerConfList.vue
+++ /dev/null
@@ -1,162 +0,0 @@
-<template>
-  <div>
-    <!--引用表格-->
-   <BasicTable @register="registerTable" :rowSelection="rowSelection">
-     <!--插槽:table标题-->
-      <template #tableTitle>
-          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
-          <a-dropdown v-if="checkedKeys.length > 0">
-              <template #overlay>
-                <a-menu>
-                  <a-menu-item key="1" @click="batchHandleDelete">
-                    <Icon icon="ant-design:delete-outlined"></Icon>
-                    删除
-                  </a-menu-item>
-                </a-menu>
-              </template>
-              <a-button>批量操作
-                <Icon icon="mdi:chevron-down"></Icon>
-              </a-button>
-        </a-dropdown>
-      </template>
-       <!--操作栏-->
-      <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
-      </template>
-      <!--字段回显插槽-->
-      <template #htmlSlot="{text}">
-         <div v-html="text"></div>
-      </template>
-      <template #fileSlot="{text}">
-         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
-      </template>
-    </BasicTable>
-    <!-- 表单区域 -->
-    <CheerConfModal @register="registerModal" @success="handleSuccess"></CheerConfModal>
-  </div>
-</template>
-
-<script lang="ts" name="cheerConf-cheerConf" setup>
-  import {ref, computed, unref} from 'vue';
-  import {BasicTable, useTable, TableAction} from '/@/components/Table';
-  import {useModal} from '/@/components/Modal';
-  import { useListPage } from '/@/hooks/system/useListPage'
-  import CheerConfModal from './components/CheerConfModal.vue'
-  import {columns, searchFormSchema} from './cheerConf.data';
-  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './cheerConf.api';
-  const checkedKeys = ref<Array<string | number>>([]);
-  //注册model
-  const [registerModal, {openModal}] = useModal();
-  //注册table数据
-  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
-      tableProps:{
-           title: '配置表',
-           api: list,
-           columns,
-           canResize:false,
-           formConfig: {
-              labelWidth: 120,
-              schemas: searchFormSchema,
-              autoSubmitOnEnter:true,
-              showAdvancedButton:true,
-              fieldMapToTime: [
-              ],
-            },
-           actionColumn: {
-               width: 120,
-            },
-      },
-       exportConfig: {
-            name:"配置表",
-            url: getExportUrl,
-          },
-          importConfig: {
-            url: getImportUrl
-          },
-  })
-
-  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
-
-   /**
-    * 新增事件
-    */
-  function handleAdd() {
-     openModal(true, {
-       isUpdate: false,
-       showFooter: true,
-     });
-  }
-   /**
-    * 编辑事件
-    */
-  function handleEdit(record: Recordable) {
-     openModal(true, {
-       record,
-       isUpdate: true,
-       showFooter: true,
-     });
-   }
-   /**
-    * 详情
-   */
-  function handleDetail(record: Recordable) {
-     openModal(true, {
-       record,
-       isUpdate: true,
-       showFooter: false,
-     });
-   }
-   /**
-    * 删除事件
-    */
-  async function handleDelete(record) {
-     await deleteOne({id: record.id}, reload);
-   }
-   /**
-    * 批量删除事件
-    */
-  async function batchHandleDelete() {
-     await batchDelete({ids: checkedKeys.value}, reload);
-   }
-   /**
-    * 成功回调
-    */
-  function handleSuccess() {
-      reload();
-   }
-   /**
-      * 操作栏
-      */
-  function getTableAction(record){
-       return [
-         {
-           label: '编辑',
-           onClick: handleEdit.bind(null, record),
-         }
-       ]
-   }
-     /**
-        * 下拉操作栏
-        */
-  function getDropDownAction(record){
-      return [
-           {
-             label: '详情',
-             onClick: handleDetail.bind(null, record),
-           }, {
-             label: '删除',
-             popConfirm: {
-               title: '是否确认删除',
-               confirm: handleDelete.bind(null, record),
-             }
-           }
-      ]
-   }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue3/components/CheerConfModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue3/components/CheerConfModal.vue
deleted file mode 100644
index 49c804e..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue3/components/CheerConfModal.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-<template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
-      <BasicForm @register="registerForm"/>
-  </BasicModal>
-</template>
-
-<script lang="ts" setup>
-    import {ref, computed, unref} from 'vue';
-    import {BasicModal, useModalInner} from '/@/components/Modal';
-    import {BasicForm, useForm} from '/@/components/Form/index';
-    import {formSchema} from '../cheerConf.data';
-    import {saveOrUpdate} from '../cheerConf.api';
-    // Emits声明
-    const emit = defineEmits(['register','success']);
-    const isUpdate = ref(true);
-    //表单配置
-    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
-        labelWidth: 150,
-        schemas: formSchema,
-        showActionButtonGroup: false,
-    });
-    //表单赋值
-    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
-        //重置表单
-        await resetFields();
-        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
-        isUpdate.value = !!data?.isUpdate;
-        if (unref(isUpdate)) {
-            //表单赋值
-            await setFieldsValue({
-                ...data.record,
-            });
-        }
-        // 隐藏底部时禁用整个表单
-       setProps({ disabled: !data?.showFooter })
-    });
-    //设置标题
-    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
-    //表单提交事件
-    async function handleSubmit(v) {
-        try {
-            let values = await validate();
-            setModalProps({confirmLoading: true});
-            //提交表单
-            await saveOrUpdate(values, isUpdate.value);
-            //关闭弹窗
-            closeModal();
-            //刷新列表
-            emit('success');
-        } finally {
-            setModalProps({confirmLoading: false});
-        }
-    }
-</script>
-
-<style lang="less" scoped>
-
-</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/controller/CheerRechargeController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/controller/CheerRechargeController.java
deleted file mode 100644
index 71e5874..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/controller/CheerRechargeController.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package org.jeecg.modules.cheerRecharge.controller;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.cheerRecharge.entity.CheerRecharge;
-import org.jeecg.modules.cheerRecharge.service.ICheerRechargeService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-
- /**
- * @Description: 充值套餐
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-@Api(tags="充值套餐")
-@RestController
-@RequestMapping("/cheerRecharge/cheerRecharge")
-@Slf4j
-public class CheerRechargeController extends JeecgController<CheerRecharge, ICheerRechargeService> {
-	@Autowired
-	private ICheerRechargeService cheerRechargeService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param cheerRecharge
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "充值套餐-分页列表查询")
-	@ApiOperation(value="充值套餐-分页列表查询", notes="充值套餐-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<CheerRecharge>> queryPageList(CheerRecharge cheerRecharge,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<CheerRecharge> queryWrapper = QueryGenerator.initQueryWrapper(cheerRecharge, req.getParameterMap());
-		Page<CheerRecharge> page = new Page<CheerRecharge>(pageNo, pageSize);
-		IPage<CheerRecharge> pageList = cheerRechargeService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	
-	/**
-	 *   添加
-	 *
-	 * @param cheerRecharge
-	 * @return
-	 */
-	@AutoLog(value = "充值套餐-添加")
-	@ApiOperation(value="充值套餐-添加", notes="充值套餐-添加")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody CheerRecharge cheerRecharge) {
-		cheerRechargeService.save(cheerRecharge);
-		return Result.OK("添加成功！");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param cheerRecharge
-	 * @return
-	 */
-	@AutoLog(value = "充值套餐-编辑")
-	@ApiOperation(value="充值套餐-编辑", notes="充值套餐-编辑")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody CheerRecharge cheerRecharge) {
-		cheerRechargeService.updateById(cheerRecharge);
-		return Result.OK("编辑成功!");
-	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "充值套餐-通过id删除")
-	@ApiOperation(value="充值套餐-通过id删除", notes="充值套餐-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		cheerRechargeService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "充值套餐-批量删除")
-	@ApiOperation(value="充值套餐-批量删除", notes="充值套餐-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.cheerRechargeService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-	
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "充值套餐-通过id查询")
-	@ApiOperation(value="充值套餐-通过id查询", notes="充值套餐-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<CheerRecharge> queryById(@RequestParam(name="id",required=true) String id) {
-		CheerRecharge cheerRecharge = cheerRechargeService.getById(id);
-		if(cheerRecharge==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(cheerRecharge);
-	}
-
-    /**
-    * 导出excel
-    *
-    * @param request
-    * @param cheerRecharge
-    */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, CheerRecharge cheerRecharge) {
-        return super.exportXls(request, cheerRecharge, CheerRecharge.class, "充值套餐");
-    }
-
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, CheerRecharge.class);
-    }
-
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/entity/CheerRecharge.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/entity/CheerRecharge.java
deleted file mode 100644
index 73c49d7..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/entity/CheerRecharge.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.jeecg.modules.cheerRecharge.entity;
-
-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.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @Description: 充值套餐
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-@Data
-@TableName("cheer_recharge")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="cheer_recharge对象", description="充值套餐")
-public class CheerRecharge implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "主键")
-    private java.lang.String id;
-	/**创建人*/
-    @ApiModelProperty(value = "创建人")
-    private java.lang.String createBy;
-	/**创建日期*/
-    @ApiModelProperty(value = "创建日期")
-    private java.util.Date createTime;
-	/**更新人*/
-    @ApiModelProperty(value = "更新人")
-    private java.lang.String updateBy;
-	/**更新日期*/
-    @ApiModelProperty(value = "更新日期")
-    private java.util.Date updateTime;
-	/**金融*/
-	@Excel(name = "金融", width = 15)
-    @ApiModelProperty(value = "金融")
-    private java.math.BigDecimal price;
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/mapper/CheerRechargeMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/mapper/CheerRechargeMapper.java
deleted file mode 100644
index d19bbd9..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/mapper/CheerRechargeMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.jeecg.modules.cheerRecharge.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.cheerRecharge.entity.CheerRecharge;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 充值套餐
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-public interface CheerRechargeMapper extends BaseMapper<CheerRecharge> {
-
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/mapper/xml/CheerRechargeMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/mapper/xml/CheerRechargeMapper.xml
deleted file mode 100644
index e025af8..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/mapper/xml/CheerRechargeMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.cheerRecharge.mapper.CheerRechargeMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/service/ICheerRechargeService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/service/ICheerRechargeService.java
deleted file mode 100644
index 5dd8ff8..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/service/ICheerRechargeService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.jeecg.modules.cheerRecharge.service;
-
-import org.jeecg.modules.cheerRecharge.entity.CheerRecharge;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 充值套餐
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-public interface ICheerRechargeService extends IService<CheerRecharge> {
-
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/service/impl/CheerRechargeServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/service/impl/CheerRechargeServiceImpl.java
deleted file mode 100644
index 8861b81..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/service/impl/CheerRechargeServiceImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.jeecg.modules.cheerRecharge.service.impl;
-
-import org.jeecg.modules.cheerRecharge.entity.CheerRecharge;
-import org.jeecg.modules.cheerRecharge.mapper.CheerRechargeMapper;
-import org.jeecg.modules.cheerRecharge.service.ICheerRechargeService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 充值套餐
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-@Service
-public class CheerRechargeServiceImpl extends ServiceImpl<CheerRechargeMapper, CheerRecharge> implements ICheerRechargeService {
-
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/CheerRechargeList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/CheerRechargeList.vue
deleted file mode 100644
index fb52825..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/CheerRechargeList.vue
+++ /dev/null
@@ -1,171 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 查询区域-END -->
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <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>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        :scroll="{x:true}"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
-
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-
-    <cheer-recharge-modal ref="modalForm" @ok="modalFormOk"></cheer-recharge-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import CheerRechargeModal from './modules/CheerRechargeModal'
-
-  export default {
-    name: 'CheerRechargeList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      CheerRechargeModal
-    },
-    data () {
-      return {
-        description: '充值套餐管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'金融',
-            align:"center",
-            dataIndex: 'price'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: "/cheerRecharge/cheerRecharge/list",
-          delete: "/cheerRecharge/cheerRecharge/delete",
-          deleteBatch: "/cheerRecharge/cheerRecharge/deleteBatch",
-          exportXlsUrl: "/cheerRecharge/cheerRecharge/exportXls",
-          importExcelUrl: "cheerRecharge/cheerRecharge/importExcel",
-          
-        },
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
-    this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
-    },
-    methods: {
-      initDictConfig(){
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'BigDecimal',value:'price',text:'金融',dictCode:''})
-        this.superFieldList = fieldList
-      }
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/modules/CheerRechargeForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/modules/CheerRechargeForm.vue
deleted file mode 100644
index 1a42f68..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/modules/CheerRechargeForm.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-<template>
-  <a-spin :spinning="confirmLoading">
-    <j-form-container :disabled="formDisabled">
-      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-        <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="金融" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
-              <a-input-number v-model="model.price" placeholder="请输入金融" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </j-form-container>
-  </a-spin>
-</template>
-
-<script>
-
-  import { httpAction, getAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
-
-  export default {
-    name: 'CheerRechargeForm',
-    components: {
-    },
-    props: {
-      //表单禁用
-      disabled: {
-        type: Boolean,
-        default: false,
-        required: false
-      }
-    },
-    data () {
-      return {
-        model:{
-         },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        validatorRules: {
-        },
-        url: {
-          add: "/cheerRecharge/cheerRecharge/add",
-          edit: "/cheerRecharge/cheerRecharge/edit",
-          queryById: "/cheerRecharge/cheerRecharge/queryById"
-        }
-      }
-    },
-    computed: {
-      formDisabled(){
-        return this.disabled
-      },
-    },
-    created () {
-       //备份model原始值
-      this.modelDefault = JSON.parse(JSON.stringify(this.model));
-    },
-    methods: {
-      add () {
-        this.edit(this.modelDefault);
-      },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
-      },
-      submitForm () {
-        const that = this;
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
-          }
-         
-        })
-      },
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/modules/CheerRechargeModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/modules/CheerRechargeModal.Style#Drawer.vue
deleted file mode 100644
index 72f22c9..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/modules/CheerRechargeModal.Style#Drawer.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <cheer-recharge-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></cheer-recharge-form>
-    <div class="drawer-footer">
-      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
-      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-
-  import CheerRechargeForm from './CheerRechargeForm'
-
-  export default {
-    name: 'CheerRechargeModal',
-    components: {
-      CheerRechargeForm
-    },
-    data () {
-      return {
-        title:"操作",
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        });
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-/** Button按钮间距 */
-  .ant-btn {
-    margin-left: 30px;
-    margin-bottom: 30px;
-    float: right;
-  }
-  .drawer-footer{
-    position: absolute;
-    bottom: -8px;
-    width: 100%;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    left: 0;
-    background: #fff;
-    border-radius: 0 0 2px 2px;
-  }
-</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/modules/CheerRechargeModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/modules/CheerRechargeModal.vue
deleted file mode 100644
index b41219d..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/modules/CheerRechargeModal.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <cheer-recharge-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cheer-recharge-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import CheerRechargeForm from './CheerRechargeForm'
-  export default {
-    name: 'CheerRechargeModal',
-    components: {
-      CheerRechargeForm
-    },
-    data () {
-      return {
-        title:'',
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/CheerRecharge.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/CheerRecharge.api.ts
deleted file mode 100644
index b013494..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/CheerRecharge.api.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import {defHttp} from '/@/utils/http/axios';
-import {Modal} from 'ant-design-vue';
-
-enum Api {
-  list = '/cheerRecharge/cheerRecharge/list',
-  save='/cheerRecharge/cheerRecharge/add',
-  edit='/cheerRecharge/cheerRecharge/edit',
-  deleteOne = '/cheerRecharge/cheerRecharge/delete',
-  deleteBatch = '/cheerRecharge/cheerRecharge/deleteBatch',
-  importExcel = '/cheerRecharge/cheerRecharge/importExcel',
-  exportXls = '/cheerRecharge/cheerRecharge/exportXls',
-}
-/**
- * 导出api
- * @param params
- */
-export const getExportUrl = Api.exportXls;
-/**
- * 导入api
- */
-export const getImportUrl = Api.importExcel;
-/**
- * 列表接口
- * @param params
- */
-export const list = (params) =>
-  defHttp.get({url: Api.list, params});
-
-/**
- * 删除单个
- */
-export const deleteOne = (params,handleSuccess) => {
-  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
-    handleSuccess();
-  });
-}
-/**
- * 批量删除
- * @param params
- */
-export const batchDelete = (params, handleSuccess) => {
-  Modal.confirm({
-    title: '确认删除',
-    content: '是否删除选中数据',
-    okText: '确认',
-    cancelText: '取消',
-    onOk: () => {
-      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
-        handleSuccess();
-      });
-    }
-  });
-}
-/**
- * 保存或者更新
- * @param params
- */
-export const saveOrUpdate = (params, isUpdate) => {
-  let url = isUpdate ? Api.edit : Api.save;
-  return defHttp.post({url: url, params});
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/CheerRecharge.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/CheerRecharge.data.ts
deleted file mode 100644
index e0f0077..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/CheerRecharge.data.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
-import { rules} from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
-//列表数据
-export const columns: BasicColumn[] = [
-    {
-    title: '金融',
-    align:"center",
-    dataIndex: 'price'
-   },
-];
-//查询数据
-export const searchFormSchema: FormSchema[] = [
-];
-//表单数据
-export const formSchema: FormSchema[] = [
-  {
-    label: '金融',
-    field: 'price',
-    component: 'InputNumber',
-  },
-];
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/CheerRechargeList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/CheerRechargeList.vue
deleted file mode 100644
index 17a6006..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/CheerRechargeList.vue
+++ /dev/null
@@ -1,162 +0,0 @@
-<template>
-  <div>
-    <!--引用表格-->
-   <BasicTable @register="registerTable" :rowSelection="rowSelection">
-     <!--插槽:table标题-->
-      <template #tableTitle>
-          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
-          <a-dropdown v-if="checkedKeys.length > 0">
-              <template #overlay>
-                <a-menu>
-                  <a-menu-item key="1" @click="batchHandleDelete">
-                    <Icon icon="ant-design:delete-outlined"></Icon>
-                    删除
-                  </a-menu-item>
-                </a-menu>
-              </template>
-              <a-button>批量操作
-                <Icon icon="mdi:chevron-down"></Icon>
-              </a-button>
-        </a-dropdown>
-      </template>
-       <!--操作栏-->
-      <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
-      </template>
-      <!--字段回显插槽-->
-      <template #htmlSlot="{text}">
-         <div v-html="text"></div>
-      </template>
-      <template #fileSlot="{text}">
-         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
-      </template>
-    </BasicTable>
-    <!-- 表单区域 -->
-    <CheerRechargeModal @register="registerModal" @success="handleSuccess"></CheerRechargeModal>
-  </div>
-</template>
-
-<script lang="ts" name="cheerRecharge-cheerRecharge" setup>
-  import {ref, computed, unref} from 'vue';
-  import {BasicTable, useTable, TableAction} from '/@/components/Table';
-  import {useModal} from '/@/components/Modal';
-  import { useListPage } from '/@/hooks/system/useListPage'
-  import CheerRechargeModal from './components/CheerRechargeModal.vue'
-  import {columns, searchFormSchema} from './cheerRecharge.data';
-  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './cheerRecharge.api';
-  const checkedKeys = ref<Array<string | number>>([]);
-  //注册model
-  const [registerModal, {openModal}] = useModal();
-  //注册table数据
-  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
-      tableProps:{
-           title: '充值套餐',
-           api: list,
-           columns,
-           canResize:false,
-           formConfig: {
-              labelWidth: 120,
-              schemas: searchFormSchema,
-              autoSubmitOnEnter:true,
-              showAdvancedButton:true,
-              fieldMapToTime: [
-              ],
-            },
-           actionColumn: {
-               width: 120,
-            },
-      },
-       exportConfig: {
-            name:"充值套餐",
-            url: getExportUrl,
-          },
-          importConfig: {
-            url: getImportUrl
-          },
-  })
-
-  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
-
-   /**
-    * 新增事件
-    */
-  function handleAdd() {
-     openModal(true, {
-       isUpdate: false,
-       showFooter: true,
-     });
-  }
-   /**
-    * 编辑事件
-    */
-  function handleEdit(record: Recordable) {
-     openModal(true, {
-       record,
-       isUpdate: true,
-       showFooter: true,
-     });
-   }
-   /**
-    * 详情
-   */
-  function handleDetail(record: Recordable) {
-     openModal(true, {
-       record,
-       isUpdate: true,
-       showFooter: false,
-     });
-   }
-   /**
-    * 删除事件
-    */
-  async function handleDelete(record) {
-     await deleteOne({id: record.id}, reload);
-   }
-   /**
-    * 批量删除事件
-    */
-  async function batchHandleDelete() {
-     await batchDelete({ids: checkedKeys.value}, reload);
-   }
-   /**
-    * 成功回调
-    */
-  function handleSuccess() {
-      reload();
-   }
-   /**
-      * 操作栏
-      */
-  function getTableAction(record){
-       return [
-         {
-           label: '编辑',
-           onClick: handleEdit.bind(null, record),
-         }
-       ]
-   }
-     /**
-        * 下拉操作栏
-        */
-  function getDropDownAction(record){
-      return [
-           {
-             label: '详情',
-             onClick: handleDetail.bind(null, record),
-           }, {
-             label: '删除',
-             popConfirm: {
-               title: '是否确认删除',
-               confirm: handleDelete.bind(null, record),
-             }
-           }
-      ]
-   }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/components/CheerRechargeModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/components/CheerRechargeModal.vue
deleted file mode 100644
index fa0861a..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/components/CheerRechargeModal.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-<template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
-      <BasicForm @register="registerForm"/>
-  </BasicModal>
-</template>
-
-<script lang="ts" setup>
-    import {ref, computed, unref} from 'vue';
-    import {BasicModal, useModalInner} from '/@/components/Modal';
-    import {BasicForm, useForm} from '/@/components/Form/index';
-    import {formSchema} from '../cheerRecharge.data';
-    import {saveOrUpdate} from '../cheerRecharge.api';
-    // Emits声明
-    const emit = defineEmits(['register','success']);
-    const isUpdate = ref(true);
-    //表单配置
-    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
-        labelWidth: 150,
-        schemas: formSchema,
-        showActionButtonGroup: false,
-    });
-    //表单赋值
-    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
-        //重置表单
-        await resetFields();
-        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
-        isUpdate.value = !!data?.isUpdate;
-        if (unref(isUpdate)) {
-            //表单赋值
-            await setFieldsValue({
-                ...data.record,
-            });
-        }
-        // 隐藏底部时禁用整个表单
-       setProps({ disabled: !data?.showFooter })
-    });
-    //设置标题
-    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
-    //表单提交事件
-    async function handleSubmit(v) {
-        try {
-            let values = await validate();
-            setModalProps({confirmLoading: true});
-            //提交表单
-            await saveOrUpdate(values, isUpdate.value);
-            //关闭弹窗
-            closeModal();
-            //刷新列表
-            emit('success');
-        } finally {
-            setModalProps({confirmLoading: false});
-        }
-    }
-</script>
-
-<style lang="less" scoped>
-
-</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/controller/CheerWaterController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/controller/CheerWaterController.java
deleted file mode 100644
index 4f80895..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/controller/CheerWaterController.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package org.jeecg.modules.cheerWater.controller;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.cheerWater.entity.CheerWater;
-import org.jeecg.modules.cheerWater.service.ICheerWaterService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-
- /**
- * @Description: 加油流水表
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-@Api(tags="加油流水表")
-@RestController
-@RequestMapping("/cheerWater/cheerWater")
-@Slf4j
-public class CheerWaterController extends JeecgController<CheerWater, ICheerWaterService> {
-	@Autowired
-	private ICheerWaterService cheerWaterService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param cheerWater
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "加油流水表-分页列表查询")
-	@ApiOperation(value="加油流水表-分页列表查询", notes="加油流水表-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<CheerWater>> queryPageList(CheerWater cheerWater,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<CheerWater> queryWrapper = QueryGenerator.initQueryWrapper(cheerWater, req.getParameterMap());
-		Page<CheerWater> page = new Page<CheerWater>(pageNo, pageSize);
-		IPage<CheerWater> pageList = cheerWaterService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	
-	/**
-	 *   添加
-	 *
-	 * @param cheerWater
-	 * @return
-	 */
-	@AutoLog(value = "加油流水表-添加")
-	@ApiOperation(value="加油流水表-添加", notes="加油流水表-添加")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody CheerWater cheerWater) {
-		cheerWaterService.save(cheerWater);
-		return Result.OK("添加成功！");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param cheerWater
-	 * @return
-	 */
-	@AutoLog(value = "加油流水表-编辑")
-	@ApiOperation(value="加油流水表-编辑", notes="加油流水表-编辑")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody CheerWater cheerWater) {
-		cheerWaterService.updateById(cheerWater);
-		return Result.OK("编辑成功!");
-	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "加油流水表-通过id删除")
-	@ApiOperation(value="加油流水表-通过id删除", notes="加油流水表-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		cheerWaterService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "加油流水表-批量删除")
-	@ApiOperation(value="加油流水表-批量删除", notes="加油流水表-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.cheerWaterService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-	
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "加油流水表-通过id查询")
-	@ApiOperation(value="加油流水表-通过id查询", notes="加油流水表-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<CheerWater> queryById(@RequestParam(name="id",required=true) String id) {
-		CheerWater cheerWater = cheerWaterService.getById(id);
-		if(cheerWater==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(cheerWater);
-	}
-
-    /**
-    * 导出excel
-    *
-    * @param request
-    * @param cheerWater
-    */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, CheerWater cheerWater) {
-        return super.exportXls(request, cheerWater, CheerWater.class, "加油流水表");
-    }
-
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, CheerWater.class);
-    }
-
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/entity/CheerWater.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/entity/CheerWater.java
deleted file mode 100644
index bd5a801..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/entity/CheerWater.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.jeecg.modules.cheerWater.entity;
-
-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.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @Description: 加油流水表
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-@Data
-@TableName("cheer_water")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="cheer_water对象", description="加油流水表")
-public class CheerWater implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "主键")
-    private java.lang.String id;
-	/**创建人*/
-    @ApiModelProperty(value = "创建人")
-    private java.lang.String createBy;
-	/**创建日期*/
-    @ApiModelProperty(value = "创建日期")
-    private java.util.Date createTime;
-	/**更新人*/
-    @ApiModelProperty(value = "更新人")
-    private java.lang.String updateBy;
-	/**更新日期*/
-    @ApiModelProperty(value = "更新日期")
-    private java.util.Date updateTime;
-	/**原价*/
-	@Excel(name = "原价", width = 15)
-    @ApiModelProperty(value = "原价")
-    private java.math.BigDecimal oldPrice;
-	/**支付价*/
-	@Excel(name = "支付价", width = 15)
-    @ApiModelProperty(value = "支付价")
-    private java.math.BigDecimal price;
-	/**订单名称*/
-	@Excel(name = "订单名称", width = 15)
-    @ApiModelProperty(value = "订单名称")
-    private java.lang.String name;
-	/**用户标识*/
-	@Excel(name = "用户标识", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
-	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
-    @ApiModelProperty(value = "用户标识")
-    private java.lang.String userId;
-	/**支付状态*/
-	@Excel(name = "支付状态", width = 15)
-    @ApiModelProperty(value = "支付状态")
-    private java.lang.String state;
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/mapper/CheerWaterMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/mapper/CheerWaterMapper.java
deleted file mode 100644
index 45b88d3..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/mapper/CheerWaterMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.jeecg.modules.cheerWater.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.cheerWater.entity.CheerWater;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 加油流水表
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-public interface CheerWaterMapper extends BaseMapper<CheerWater> {
-
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/mapper/xml/CheerWaterMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/mapper/xml/CheerWaterMapper.xml
deleted file mode 100644
index 0656457..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/mapper/xml/CheerWaterMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.cheerWater.mapper.CheerWaterMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/service/ICheerWaterService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/service/ICheerWaterService.java
deleted file mode 100644
index 1932122..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/service/ICheerWaterService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.jeecg.modules.cheerWater.service;
-
-import org.jeecg.modules.cheerWater.entity.CheerWater;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 加油流水表
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-public interface ICheerWaterService extends IService<CheerWater> {
-
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/service/impl/CheerWaterServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/service/impl/CheerWaterServiceImpl.java
deleted file mode 100644
index 50238e9..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/service/impl/CheerWaterServiceImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.jeecg.modules.cheerWater.service.impl;
-
-import org.jeecg.modules.cheerWater.entity.CheerWater;
-import org.jeecg.modules.cheerWater.mapper.CheerWaterMapper;
-import org.jeecg.modules.cheerWater.service.ICheerWaterService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 加油流水表
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-@Service
-public class CheerWaterServiceImpl extends ServiceImpl<CheerWaterMapper, CheerWater> implements ICheerWaterService {
-
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/CheerWaterList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/CheerWaterList.vue
deleted file mode 100644
index 867cea1..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/CheerWaterList.vue
+++ /dev/null
@@ -1,203 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 查询区域-END -->
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <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>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        :scroll="{x:true}"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
-
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-
-    <cheer-water-modal ref="modalForm" @ok="modalFormOk"></cheer-water-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import CheerWaterModal from './modules/CheerWaterModal'
-  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-
-  export default {
-    name: 'CheerWaterList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      CheerWaterModal
-    },
-    data () {
-      return {
-        description: '加油流水表管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'创建日期',
-            align:"center",
-            sorter: true,
-            dataIndex: 'createTime'
-          },
-          {
-            title:'原价',
-            align:"center",
-            dataIndex: 'oldPrice'
-          },
-          {
-            title:'支付价',
-            align:"center",
-            dataIndex: 'price'
-          },
-          {
-            title:'订单名称',
-            align:"center",
-            dataIndex: 'name'
-          },
-          {
-            title:'用户标识',
-            align:"center",
-            dataIndex: 'userId_dictText'
-          },
-          {
-            title:'支付状态',
-            align:"center",
-            dataIndex: 'state'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: "/cheerWater/cheerWater/list",
-          delete: "/cheerWater/cheerWater/delete",
-          deleteBatch: "/cheerWater/cheerWater/deleteBatch",
-          exportXlsUrl: "/cheerWater/cheerWater/exportXls",
-          importExcelUrl: "cheerWater/cheerWater/importExcel",
-          
-        },
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
-    this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
-    },
-    methods: {
-      initDictConfig(){
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
-        fieldList.push({type:'BigDecimal',value:'oldPrice',text:'原价',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'price',text:'支付价',dictCode:''})
-        fieldList.push({type:'string',value:'name',text:'订单名称',dictCode:''})
-        fieldList.push({type:'sel_search',value:'userId',text:'用户标识',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
-        fieldList.push({type:'string',value:'state',text:'支付状态',dictCode:''})
-        this.superFieldList = fieldList
-      }
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/modules/CheerWaterForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/modules/CheerWaterForm.vue
deleted file mode 100644
index 23a4dc7..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/modules/CheerWaterForm.vue
+++ /dev/null
@@ -1,124 +0,0 @@
-<template>
-  <a-spin :spinning="confirmLoading">
-    <j-form-container :disabled="formDisabled">
-      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-        <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="原价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="oldPrice">
-              <a-input-number v-model="model.oldPrice" placeholder="请输入原价" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="支付价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
-              <a-input-number v-model="model.price" placeholder="请输入支付价" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="订单名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
-              <a-input v-model="model.name" placeholder="请输入订单名称"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="用户标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
-              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="支付状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
-              <a-input v-model="model.state" placeholder="请输入支付状态"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </j-form-container>
-  </a-spin>
-</template>
-
-<script>
-
-  import { httpAction, getAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
-
-  export default {
-    name: 'CheerWaterForm',
-    components: {
-    },
-    props: {
-      //表单禁用
-      disabled: {
-        type: Boolean,
-        default: false,
-        required: false
-      }
-    },
-    data () {
-      return {
-        model:{
-         },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        validatorRules: {
-        },
-        url: {
-          add: "/cheerWater/cheerWater/add",
-          edit: "/cheerWater/cheerWater/edit",
-          queryById: "/cheerWater/cheerWater/queryById"
-        }
-      }
-    },
-    computed: {
-      formDisabled(){
-        return this.disabled
-      },
-    },
-    created () {
-       //备份model原始值
-      this.modelDefault = JSON.parse(JSON.stringify(this.model));
-    },
-    methods: {
-      add () {
-        this.edit(this.modelDefault);
-      },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
-      },
-      submitForm () {
-        const that = this;
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
-          }
-         
-        })
-      },
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/modules/CheerWaterModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/modules/CheerWaterModal.Style#Drawer.vue
deleted file mode 100644
index 7c8d9f1..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/modules/CheerWaterModal.Style#Drawer.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <cheer-water-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></cheer-water-form>
-    <div class="drawer-footer">
-      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
-      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-
-  import CheerWaterForm from './CheerWaterForm'
-
-  export default {
-    name: 'CheerWaterModal',
-    components: {
-      CheerWaterForm
-    },
-    data () {
-      return {
-        title:"操作",
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        });
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-/** Button按钮间距 */
-  .ant-btn {
-    margin-left: 30px;
-    margin-bottom: 30px;
-    float: right;
-  }
-  .drawer-footer{
-    position: absolute;
-    bottom: -8px;
-    width: 100%;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    left: 0;
-    background: #fff;
-    border-radius: 0 0 2px 2px;
-  }
-</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/modules/CheerWaterModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/modules/CheerWaterModal.vue
deleted file mode 100644
index 91db811..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/modules/CheerWaterModal.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <cheer-water-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cheer-water-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import CheerWaterForm from './CheerWaterForm'
-  export default {
-    name: 'CheerWaterModal',
-    components: {
-      CheerWaterForm
-    },
-    data () {
-      return {
-        title:'',
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/CheerWater.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/CheerWater.api.ts
deleted file mode 100644
index c11f370..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/CheerWater.api.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import {defHttp} from '/@/utils/http/axios';
-import {Modal} from 'ant-design-vue';
-
-enum Api {
-  list = '/cheerWater/cheerWater/list',
-  save='/cheerWater/cheerWater/add',
-  edit='/cheerWater/cheerWater/edit',
-  deleteOne = '/cheerWater/cheerWater/delete',
-  deleteBatch = '/cheerWater/cheerWater/deleteBatch',
-  importExcel = '/cheerWater/cheerWater/importExcel',
-  exportXls = '/cheerWater/cheerWater/exportXls',
-}
-/**
- * 导出api
- * @param params
- */
-export const getExportUrl = Api.exportXls;
-/**
- * 导入api
- */
-export const getImportUrl = Api.importExcel;
-/**
- * 列表接口
- * @param params
- */
-export const list = (params) =>
-  defHttp.get({url: Api.list, params});
-
-/**
- * 删除单个
- */
-export const deleteOne = (params,handleSuccess) => {
-  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
-    handleSuccess();
-  });
-}
-/**
- * 批量删除
- * @param params
- */
-export const batchDelete = (params, handleSuccess) => {
-  Modal.confirm({
-    title: '确认删除',
-    content: '是否删除选中数据',
-    okText: '确认',
-    cancelText: '取消',
-    onOk: () => {
-      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
-        handleSuccess();
-      });
-    }
-  });
-}
-/**
- * 保存或者更新
- * @param params
- */
-export const saveOrUpdate = (params, isUpdate) => {
-  let url = isUpdate ? Api.edit : Api.save;
-  return defHttp.post({url: url, params});
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/CheerWater.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/CheerWater.data.ts
deleted file mode 100644
index 10a7a80..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/CheerWater.data.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
-import { rules} from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
-//列表数据
-export const columns: BasicColumn[] = [
-    {
-    title: '创建日期',
-    align:"center",
-    sorter: true,
-    dataIndex: 'createTime'
-   },
-   {
-    title: '原价',
-    align:"center",
-    dataIndex: 'oldPrice'
-   },
-   {
-    title: '支付价',
-    align:"center",
-    dataIndex: 'price'
-   },
-   {
-    title: '订单名称',
-    align:"center",
-    dataIndex: 'name'
-   },
-   {
-    title: '用户标识',
-    align:"center",
-    dataIndex: 'userId_dictText'
-   },
-   {
-    title: '支付状态',
-    align:"center",
-    dataIndex: 'state'
-   },
-];
-//查询数据
-export const searchFormSchema: FormSchema[] = [
-];
-//表单数据
-export const formSchema: FormSchema[] = [
-  {
-    label: '原价',
-    field: 'oldPrice',
-    component: 'InputNumber',
-  },
-  {
-    label: '支付价',
-    field: 'price',
-    component: 'InputNumber',
-  },
-  {
-    label: '订单名称',
-    field: 'name',
-    component: 'Input',
-  },
-  {
-    label: '用户标识',
-    field: 'userId',
-    component: 'JSearchSelect',
-    componentProps:{
-       dict:"han_hai_member,nick_name,id"
-    },
-  },
-  {
-    label: '支付状态',
-    field: 'state',
-    component: 'Input',
-  },
-];
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/CheerWaterList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/CheerWaterList.vue
deleted file mode 100644
index 7b54d9e..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/CheerWaterList.vue
+++ /dev/null
@@ -1,162 +0,0 @@
-<template>
-  <div>
-    <!--引用表格-->
-   <BasicTable @register="registerTable" :rowSelection="rowSelection">
-     <!--插槽:table标题-->
-      <template #tableTitle>
-          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
-          <a-dropdown v-if="checkedKeys.length > 0">
-              <template #overlay>
-                <a-menu>
-                  <a-menu-item key="1" @click="batchHandleDelete">
-                    <Icon icon="ant-design:delete-outlined"></Icon>
-                    删除
-                  </a-menu-item>
-                </a-menu>
-              </template>
-              <a-button>批量操作
-                <Icon icon="mdi:chevron-down"></Icon>
-              </a-button>
-        </a-dropdown>
-      </template>
-       <!--操作栏-->
-      <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
-      </template>
-      <!--字段回显插槽-->
-      <template #htmlSlot="{text}">
-         <div v-html="text"></div>
-      </template>
-      <template #fileSlot="{text}">
-         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
-      </template>
-    </BasicTable>
-    <!-- 表单区域 -->
-    <CheerWaterModal @register="registerModal" @success="handleSuccess"></CheerWaterModal>
-  </div>
-</template>
-
-<script lang="ts" name="cheerWater-cheerWater" setup>
-  import {ref, computed, unref} from 'vue';
-  import {BasicTable, useTable, TableAction} from '/@/components/Table';
-  import {useModal} from '/@/components/Modal';
-  import { useListPage } from '/@/hooks/system/useListPage'
-  import CheerWaterModal from './components/CheerWaterModal.vue'
-  import {columns, searchFormSchema} from './cheerWater.data';
-  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './cheerWater.api';
-  const checkedKeys = ref<Array<string | number>>([]);
-  //注册model
-  const [registerModal, {openModal}] = useModal();
-  //注册table数据
-  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
-      tableProps:{
-           title: '加油流水表',
-           api: list,
-           columns,
-           canResize:false,
-           formConfig: {
-              labelWidth: 120,
-              schemas: searchFormSchema,
-              autoSubmitOnEnter:true,
-              showAdvancedButton:true,
-              fieldMapToTime: [
-              ],
-            },
-           actionColumn: {
-               width: 120,
-            },
-      },
-       exportConfig: {
-            name:"加油流水表",
-            url: getExportUrl,
-          },
-          importConfig: {
-            url: getImportUrl
-          },
-  })
-
-  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
-
-   /**
-    * 新增事件
-    */
-  function handleAdd() {
-     openModal(true, {
-       isUpdate: false,
-       showFooter: true,
-     });
-  }
-   /**
-    * 编辑事件
-    */
-  function handleEdit(record: Recordable) {
-     openModal(true, {
-       record,
-       isUpdate: true,
-       showFooter: true,
-     });
-   }
-   /**
-    * 详情
-   */
-  function handleDetail(record: Recordable) {
-     openModal(true, {
-       record,
-       isUpdate: true,
-       showFooter: false,
-     });
-   }
-   /**
-    * 删除事件
-    */
-  async function handleDelete(record) {
-     await deleteOne({id: record.id}, reload);
-   }
-   /**
-    * 批量删除事件
-    */
-  async function batchHandleDelete() {
-     await batchDelete({ids: checkedKeys.value}, reload);
-   }
-   /**
-    * 成功回调
-    */
-  function handleSuccess() {
-      reload();
-   }
-   /**
-      * 操作栏
-      */
-  function getTableAction(record){
-       return [
-         {
-           label: '编辑',
-           onClick: handleEdit.bind(null, record),
-         }
-       ]
-   }
-     /**
-        * 下拉操作栏
-        */
-  function getDropDownAction(record){
-      return [
-           {
-             label: '详情',
-             onClick: handleDetail.bind(null, record),
-           }, {
-             label: '删除',
-             popConfirm: {
-               title: '是否确认删除',
-               confirm: handleDelete.bind(null, record),
-             }
-           }
-      ]
-   }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/components/CheerWaterModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/components/CheerWaterModal.vue
deleted file mode 100644
index faa1ac3..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/components/CheerWaterModal.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-<template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
-      <BasicForm @register="registerForm"/>
-  </BasicModal>
-</template>
-
-<script lang="ts" setup>
-    import {ref, computed, unref} from 'vue';
-    import {BasicModal, useModalInner} from '/@/components/Modal';
-    import {BasicForm, useForm} from '/@/components/Form/index';
-    import {formSchema} from '../cheerWater.data';
-    import {saveOrUpdate} from '../cheerWater.api';
-    // Emits声明
-    const emit = defineEmits(['register','success']);
-    const isUpdate = ref(true);
-    //表单配置
-    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
-        labelWidth: 150,
-        schemas: formSchema,
-        showActionButtonGroup: false,
-    });
-    //表单赋值
-    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
-        //重置表单
-        await resetFields();
-        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
-        isUpdate.value = !!data?.isUpdate;
-        if (unref(isUpdate)) {
-            //表单赋值
-            await setFieldsValue({
-                ...data.record,
-            });
-        }
-        // 隐藏底部时禁用整个表单
-       setProps({ disabled: !data?.showFooter })
-    });
-    //设置标题
-    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
-    //表单提交事件
-    async function handleSubmit(v) {
-        try {
-            let values = await validate();
-            setModalProps({confirmLoading: true});
-            //提交表单
-            await saveOrUpdate(values, isUpdate.value);
-            //关闭弹窗
-            closeModal();
-            //刷新列表
-            emit('success');
-        } finally {
-            setModalProps({confirmLoading: false});
-        }
-    }
-</script>
-
-<style lang="less" scoped>
-
-</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/controller/PayOrderController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/controller/PayOrderController.java
deleted file mode 100644
index f343cad..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/controller/PayOrderController.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package org.jeecg.modules.payOrder.controller;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.payOrder.entity.PayOrder;
-import org.jeecg.modules.payOrder.service.IPayOrderService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-
- /**
- * @Description: 知识付费订单表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-@Api(tags="知识付费订单表")
-@RestController
-@RequestMapping("/payOrder/payOrder")
-@Slf4j
-public class PayOrderController extends JeecgController<PayOrder, IPayOrderService> {
-	@Autowired
-	private IPayOrderService payOrderService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param payOrder
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "知识付费订单表-分页列表查询")
-	@ApiOperation(value="知识付费订单表-分页列表查询", notes="知识付费订单表-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<PayOrder>> queryPageList(PayOrder payOrder,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<PayOrder> queryWrapper = QueryGenerator.initQueryWrapper(payOrder, req.getParameterMap());
-		Page<PayOrder> page = new Page<PayOrder>(pageNo, pageSize);
-		IPage<PayOrder> pageList = payOrderService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	
-	/**
-	 *   添加
-	 *
-	 * @param payOrder
-	 * @return
-	 */
-	@AutoLog(value = "知识付费订单表-添加")
-	@ApiOperation(value="知识付费订单表-添加", notes="知识付费订单表-添加")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody PayOrder payOrder) {
-		payOrderService.save(payOrder);
-		return Result.OK("添加成功！");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param payOrder
-	 * @return
-	 */
-	@AutoLog(value = "知识付费订单表-编辑")
-	@ApiOperation(value="知识付费订单表-编辑", notes="知识付费订单表-编辑")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody PayOrder payOrder) {
-		payOrderService.updateById(payOrder);
-		return Result.OK("编辑成功!");
-	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "知识付费订单表-通过id删除")
-	@ApiOperation(value="知识付费订单表-通过id删除", notes="知识付费订单表-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		payOrderService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "知识付费订单表-批量删除")
-	@ApiOperation(value="知识付费订单表-批量删除", notes="知识付费订单表-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.payOrderService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-	
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "知识付费订单表-通过id查询")
-	@ApiOperation(value="知识付费订单表-通过id查询", notes="知识付费订单表-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<PayOrder> queryById(@RequestParam(name="id",required=true) String id) {
-		PayOrder payOrder = payOrderService.getById(id);
-		if(payOrder==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(payOrder);
-	}
-
-    /**
-    * 导出excel
-    *
-    * @param request
-    * @param payOrder
-    */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, PayOrder payOrder) {
-        return super.exportXls(request, payOrder, PayOrder.class, "知识付费订单表");
-    }
-
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, PayOrder.class);
-    }
-
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/entity/PayOrder.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/entity/PayOrder.java
deleted file mode 100644
index e456b53..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/entity/PayOrder.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.jeecg.modules.payOrder.entity;
-
-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.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @Description: 知识付费订单表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-@Data
-@TableName("pay_order")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="pay_order对象", description="知识付费订单表")
-public class PayOrder implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "主键")
-    private java.lang.String id;
-	/**创建人*/
-    @ApiModelProperty(value = "创建人")
-    private java.lang.String createBy;
-	/**创建日期*/
-    @ApiModelProperty(value = "创建日期")
-    private java.util.Date createTime;
-	/**更新人*/
-    @ApiModelProperty(value = "更新人")
-    private java.lang.String updateBy;
-	/**更新日期*/
-    @ApiModelProperty(value = "更新日期")
-    private java.util.Date updateTime;
-	/**商品标识*/
-	@Excel(name = "商品标识", width = 15)
-    @ApiModelProperty(value = "商品标识")
-    private java.lang.String shopId;
-	/**订单名称*/
-	@Excel(name = "订单名称", width = 15)
-    @ApiModelProperty(value = "订单名称")
-    private java.lang.String title;
-	/**价格*/
-	@Excel(name = "价格", width = 15)
-    @ApiModelProperty(value = "价格")
-    private java.math.BigDecimal price;
-	/**数量*/
-	@Excel(name = "数量", width = 15)
-    @ApiModelProperty(value = "数量")
-    private java.lang.Integer num;
-	/**用户*/
-	@Excel(name = "用户", width = 15)
-    @ApiModelProperty(value = "用户")
-    private java.lang.String userId;
-	/**状态*/
-	@Excel(name = "状态", width = 15)
-    @ApiModelProperty(value = "状态")
-    private java.lang.Integer state;
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/mapper/PayOrderMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/mapper/PayOrderMapper.java
deleted file mode 100644
index ae6d59a..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/mapper/PayOrderMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.jeecg.modules.payOrder.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.payOrder.entity.PayOrder;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 知识付费订单表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-public interface PayOrderMapper extends BaseMapper<PayOrder> {
-
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/mapper/xml/PayOrderMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/mapper/xml/PayOrderMapper.xml
deleted file mode 100644
index 7b0a219..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/mapper/xml/PayOrderMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.payOrder.mapper.PayOrderMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/service/IPayOrderService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/service/IPayOrderService.java
deleted file mode 100644
index f9ebe60..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/service/IPayOrderService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.jeecg.modules.payOrder.service;
-
-import org.jeecg.modules.payOrder.entity.PayOrder;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 知识付费订单表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-public interface IPayOrderService extends IService<PayOrder> {
-
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/service/impl/PayOrderServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/service/impl/PayOrderServiceImpl.java
deleted file mode 100644
index 5cc5b1b..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/service/impl/PayOrderServiceImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.jeecg.modules.payOrder.service.impl;
-
-import org.jeecg.modules.payOrder.entity.PayOrder;
-import org.jeecg.modules.payOrder.mapper.PayOrderMapper;
-import org.jeecg.modules.payOrder.service.IPayOrderService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 知识付费订单表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-@Service
-public class PayOrderServiceImpl extends ServiceImpl<PayOrderMapper, PayOrder> implements IPayOrderService {
-
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue/PayOrderList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue/PayOrderList.vue
deleted file mode 100644
index 40db8ae..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue/PayOrderList.vue
+++ /dev/null
@@ -1,201 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 查询区域-END -->
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <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>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        :scroll="{x:true}"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
-
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-
-    <pay-order-modal ref="modalForm" @ok="modalFormOk"></pay-order-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import PayOrderModal from './modules/PayOrderModal'
-
-  export default {
-    name: 'PayOrderList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      PayOrderModal
-    },
-    data () {
-      return {
-        description: '知识付费订单表管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'商品标识',
-            align:"center",
-            dataIndex: 'shopId'
-          },
-          {
-            title:'订单名称',
-            align:"center",
-            dataIndex: 'title'
-          },
-          {
-            title:'价格',
-            align:"center",
-            dataIndex: 'price'
-          },
-          {
-            title:'数量',
-            align:"center",
-            dataIndex: 'num'
-          },
-          {
-            title:'用户',
-            align:"center",
-            dataIndex: 'userId'
-          },
-          {
-            title:'状态',
-            align:"center",
-            dataIndex: 'state'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: "/payOrder/payOrder/list",
-          delete: "/payOrder/payOrder/delete",
-          deleteBatch: "/payOrder/payOrder/deleteBatch",
-          exportXlsUrl: "/payOrder/payOrder/exportXls",
-          importExcelUrl: "payOrder/payOrder/importExcel",
-          
-        },
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
-    this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
-    },
-    methods: {
-      initDictConfig(){
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'shopId',text:'商品标识',dictCode:''})
-        fieldList.push({type:'string',value:'title',text:'订单名称',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''})
-        fieldList.push({type:'int',value:'num',text:'数量',dictCode:''})
-        fieldList.push({type:'string',value:'userId',text:'用户',dictCode:''})
-        fieldList.push({type:'int',value:'state',text:'状态',dictCode:''})
-        this.superFieldList = fieldList
-      }
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue/modules/PayOrderForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue/modules/PayOrderForm.vue
deleted file mode 100644
index 75aafc2..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue/modules/PayOrderForm.vue
+++ /dev/null
@@ -1,129 +0,0 @@
-<template>
-  <a-spin :spinning="confirmLoading">
-    <j-form-container :disabled="formDisabled">
-      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-        <a-row>
-          <a-col :span="24">
-            <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">
-            <a-form-model-item label="订单名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
-              <a-input v-model="model.title" placeholder="请输入订单名称"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
-              <a-input-number v-model="model.price" placeholder="请输入价格" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
-              <a-input-number v-model="model.num" placeholder="请输入数量" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <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="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
-              <a-input-number v-model="model.state" placeholder="请输入状态" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </j-form-container>
-  </a-spin>
-</template>
-
-<script>
-
-  import { httpAction, getAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
-
-  export default {
-    name: 'PayOrderForm',
-    components: {
-    },
-    props: {
-      //表单禁用
-      disabled: {
-        type: Boolean,
-        default: false,
-        required: false
-      }
-    },
-    data () {
-      return {
-        model:{
-         },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        validatorRules: {
-        },
-        url: {
-          add: "/payOrder/payOrder/add",
-          edit: "/payOrder/payOrder/edit",
-          queryById: "/payOrder/payOrder/queryById"
-        }
-      }
-    },
-    computed: {
-      formDisabled(){
-        return this.disabled
-      },
-    },
-    created () {
-       //备份model原始值
-      this.modelDefault = JSON.parse(JSON.stringify(this.model));
-    },
-    methods: {
-      add () {
-        this.edit(this.modelDefault);
-      },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
-      },
-      submitForm () {
-        const that = this;
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
-          }
-         
-        })
-      },
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue/modules/PayOrderModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue/modules/PayOrderModal.Style#Drawer.vue
deleted file mode 100644
index d5d01b2..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue/modules/PayOrderModal.Style#Drawer.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <pay-order-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></pay-order-form>
-    <div class="drawer-footer">
-      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
-      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-
-  import PayOrderForm from './PayOrderForm'
-
-  export default {
-    name: 'PayOrderModal',
-    components: {
-      PayOrderForm
-    },
-    data () {
-      return {
-        title:"操作",
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        });
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-/** Button按钮间距 */
-  .ant-btn {
-    margin-left: 30px;
-    margin-bottom: 30px;
-    float: right;
-  }
-  .drawer-footer{
-    position: absolute;
-    bottom: -8px;
-    width: 100%;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    left: 0;
-    background: #fff;
-    border-radius: 0 0 2px 2px;
-  }
-</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue/modules/PayOrderModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue/modules/PayOrderModal.vue
deleted file mode 100644
index 26cb93e..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue/modules/PayOrderModal.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <pay-order-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></pay-order-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import PayOrderForm from './PayOrderForm'
-  export default {
-    name: 'PayOrderModal',
-    components: {
-      PayOrderForm
-    },
-    data () {
-      return {
-        title:'',
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue3/PayOrder.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue3/PayOrder.api.ts
deleted file mode 100644
index 5050c78..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue3/PayOrder.api.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import {defHttp} from '/@/utils/http/axios';
-import {Modal} from 'ant-design-vue';
-
-enum Api {
-  list = '/payOrder/payOrder/list',
-  save='/payOrder/payOrder/add',
-  edit='/payOrder/payOrder/edit',
-  deleteOne = '/payOrder/payOrder/delete',
-  deleteBatch = '/payOrder/payOrder/deleteBatch',
-  importExcel = '/payOrder/payOrder/importExcel',
-  exportXls = '/payOrder/payOrder/exportXls',
-}
-/**
- * 导出api
- * @param params
- */
-export const getExportUrl = Api.exportXls;
-/**
- * 导入api
- */
-export const getImportUrl = Api.importExcel;
-/**
- * 列表接口
- * @param params
- */
-export const list = (params) =>
-  defHttp.get({url: Api.list, params});
-
-/**
- * 删除单个
- */
-export const deleteOne = (params,handleSuccess) => {
-  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
-    handleSuccess();
-  });
-}
-/**
- * 批量删除
- * @param params
- */
-export const batchDelete = (params, handleSuccess) => {
-  Modal.confirm({
-    title: '确认删除',
-    content: '是否删除选中数据',
-    okText: '确认',
-    cancelText: '取消',
-    onOk: () => {
-      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
-        handleSuccess();
-      });
-    }
-  });
-}
-/**
- * 保存或者更新
- * @param params
- */
-export const saveOrUpdate = (params, isUpdate) => {
-  let url = isUpdate ? Api.edit : Api.save;
-  return defHttp.post({url: url, params});
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue3/PayOrder.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue3/PayOrder.data.ts
deleted file mode 100644
index 41897f8..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue3/PayOrder.data.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
-import { rules} from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
-//列表数据
-export const columns: BasicColumn[] = [
-    {
-    title: '商品标识',
-    align:"center",
-    dataIndex: 'shopId'
-   },
-   {
-    title: '订单名称',
-    align:"center",
-    dataIndex: 'title'
-   },
-   {
-    title: '价格',
-    align:"center",
-    dataIndex: 'price'
-   },
-   {
-    title: '数量',
-    align:"center",
-    dataIndex: 'num'
-   },
-   {
-    title: '用户',
-    align:"center",
-    dataIndex: 'userId'
-   },
-   {
-    title: '状态',
-    align:"center",
-    dataIndex: 'state'
-   },
-];
-//查询数据
-export const searchFormSchema: FormSchema[] = [
-];
-//表单数据
-export const formSchema: FormSchema[] = [
-  {
-    label: '商品标识',
-    field: 'shopId',
-    component: 'Input',
-  },
-  {
-    label: '订单名称',
-    field: 'title',
-    component: 'Input',
-  },
-  {
-    label: '价格',
-    field: 'price',
-    component: 'InputNumber',
-  },
-  {
-    label: '数量',
-    field: 'num',
-    component: 'InputNumber',
-  },
-  {
-    label: '用户',
-    field: 'userId',
-    component: 'Input',
-  },
-  {
-    label: '状态',
-    field: 'state',
-    component: 'InputNumber',
-  },
-];
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue3/PayOrderList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue3/PayOrderList.vue
deleted file mode 100644
index 1935da9..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue3/PayOrderList.vue
+++ /dev/null
@@ -1,162 +0,0 @@
-<template>
-  <div>
-    <!--引用表格-->
-   <BasicTable @register="registerTable" :rowSelection="rowSelection">
-     <!--插槽:table标题-->
-      <template #tableTitle>
-          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
-          <a-dropdown v-if="checkedKeys.length > 0">
-              <template #overlay>
-                <a-menu>
-                  <a-menu-item key="1" @click="batchHandleDelete">
-                    <Icon icon="ant-design:delete-outlined"></Icon>
-                    删除
-                  </a-menu-item>
-                </a-menu>
-              </template>
-              <a-button>批量操作
-                <Icon icon="mdi:chevron-down"></Icon>
-              </a-button>
-        </a-dropdown>
-      </template>
-       <!--操作栏-->
-      <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
-      </template>
-      <!--字段回显插槽-->
-      <template #htmlSlot="{text}">
-         <div v-html="text"></div>
-      </template>
-      <template #fileSlot="{text}">
-         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
-      </template>
-    </BasicTable>
-    <!-- 表单区域 -->
-    <PayOrderModal @register="registerModal" @success="handleSuccess"></PayOrderModal>
-  </div>
-</template>
-
-<script lang="ts" name="payOrder-payOrder" setup>
-  import {ref, computed, unref} from 'vue';
-  import {BasicTable, useTable, TableAction} from '/@/components/Table';
-  import {useModal} from '/@/components/Modal';
-  import { useListPage } from '/@/hooks/system/useListPage'
-  import PayOrderModal from './components/PayOrderModal.vue'
-  import {columns, searchFormSchema} from './payOrder.data';
-  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './payOrder.api';
-  const checkedKeys = ref<Array<string | number>>([]);
-  //注册model
-  const [registerModal, {openModal}] = useModal();
-  //注册table数据
-  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
-      tableProps:{
-           title: '知识付费订单表',
-           api: list,
-           columns,
-           canResize:false,
-           formConfig: {
-              labelWidth: 120,
-              schemas: searchFormSchema,
-              autoSubmitOnEnter:true,
-              showAdvancedButton:true,
-              fieldMapToTime: [
-              ],
-            },
-           actionColumn: {
-               width: 120,
-            },
-      },
-       exportConfig: {
-            name:"知识付费订单表",
-            url: getExportUrl,
-          },
-          importConfig: {
-            url: getImportUrl
-          },
-  })
-
-  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
-
-   /**
-    * 新增事件
-    */
-  function handleAdd() {
-     openModal(true, {
-       isUpdate: false,
-       showFooter: true,
-     });
-  }
-   /**
-    * 编辑事件
-    */
-  function handleEdit(record: Recordable) {
-     openModal(true, {
-       record,
-       isUpdate: true,
-       showFooter: true,
-     });
-   }
-   /**
-    * 详情
-   */
-  function handleDetail(record: Recordable) {
-     openModal(true, {
-       record,
-       isUpdate: true,
-       showFooter: false,
-     });
-   }
-   /**
-    * 删除事件
-    */
-  async function handleDelete(record) {
-     await deleteOne({id: record.id}, reload);
-   }
-   /**
-    * 批量删除事件
-    */
-  async function batchHandleDelete() {
-     await batchDelete({ids: checkedKeys.value}, reload);
-   }
-   /**
-    * 成功回调
-    */
-  function handleSuccess() {
-      reload();
-   }
-   /**
-      * 操作栏
-      */
-  function getTableAction(record){
-       return [
-         {
-           label: '编辑',
-           onClick: handleEdit.bind(null, record),
-         }
-       ]
-   }
-     /**
-        * 下拉操作栏
-        */
-  function getDropDownAction(record){
-      return [
-           {
-             label: '详情',
-             onClick: handleDetail.bind(null, record),
-           }, {
-             label: '删除',
-             popConfirm: {
-               title: '是否确认删除',
-               confirm: handleDelete.bind(null, record),
-             }
-           }
-      ]
-   }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue3/components/PayOrderModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue3/components/PayOrderModal.vue
deleted file mode 100644
index 262e465..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue3/components/PayOrderModal.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-<template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
-      <BasicForm @register="registerForm"/>
-  </BasicModal>
-</template>
-
-<script lang="ts" setup>
-    import {ref, computed, unref} from 'vue';
-    import {BasicModal, useModalInner} from '/@/components/Modal';
-    import {BasicForm, useForm} from '/@/components/Form/index';
-    import {formSchema} from '../payOrder.data';
-    import {saveOrUpdate} from '../payOrder.api';
-    // Emits声明
-    const emit = defineEmits(['register','success']);
-    const isUpdate = ref(true);
-    //表单配置
-    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
-        labelWidth: 150,
-        schemas: formSchema,
-        showActionButtonGroup: false,
-    });
-    //表单赋值
-    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
-        //重置表单
-        await resetFields();
-        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
-        isUpdate.value = !!data?.isUpdate;
-        if (unref(isUpdate)) {
-            //表单赋值
-            await setFieldsValue({
-                ...data.record,
-            });
-        }
-        // 隐藏底部时禁用整个表单
-       setProps({ disabled: !data?.showFooter })
-    });
-    //设置标题
-    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
-    //表单提交事件
-    async function handleSubmit(v) {
-        try {
-            let values = await validate();
-            setModalProps({confirmLoading: true});
-            //提交表单
-            await saveOrUpdate(values, isUpdate.value);
-            //关闭弹窗
-            closeModal();
-            //刷新列表
-            emit('success');
-        } finally {
-            setModalProps({confirmLoading: false});
-        }
-    }
-</script>
-
-<style lang="less" scoped>
-
-</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/controller/PayShopController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/controller/PayShopController.java
deleted file mode 100644
index 9934557..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/controller/PayShopController.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package org.jeecg.modules.payShop.controller;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.payShop.entity.PayShop;
-import org.jeecg.modules.payShop.service.IPayShopService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-
- /**
- * @Description: 付费商品修改表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-@Api(tags="付费商品修改表")
-@RestController
-@RequestMapping("/payShop/payShop")
-@Slf4j
-public class PayShopController extends JeecgController<PayShop, IPayShopService> {
-	@Autowired
-	private IPayShopService payShopService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param payShop
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "付费商品修改表-分页列表查询")
-	@ApiOperation(value="付费商品修改表-分页列表查询", notes="付费商品修改表-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<PayShop>> queryPageList(PayShop payShop,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<PayShop> queryWrapper = QueryGenerator.initQueryWrapper(payShop, req.getParameterMap());
-		Page<PayShop> page = new Page<PayShop>(pageNo, pageSize);
-		IPage<PayShop> pageList = payShopService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	
-	/**
-	 *   添加
-	 *
-	 * @param payShop
-	 * @return
-	 */
-	@AutoLog(value = "付费商品修改表-添加")
-	@ApiOperation(value="付费商品修改表-添加", notes="付费商品修改表-添加")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody PayShop payShop) {
-		payShopService.save(payShop);
-		return Result.OK("添加成功！");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param payShop
-	 * @return
-	 */
-	@AutoLog(value = "付费商品修改表-编辑")
-	@ApiOperation(value="付费商品修改表-编辑", notes="付费商品修改表-编辑")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody PayShop payShop) {
-		payShopService.updateById(payShop);
-		return Result.OK("编辑成功!");
-	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "付费商品修改表-通过id删除")
-	@ApiOperation(value="付费商品修改表-通过id删除", notes="付费商品修改表-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		payShopService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "付费商品修改表-批量删除")
-	@ApiOperation(value="付费商品修改表-批量删除", notes="付费商品修改表-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.payShopService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-	
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "付费商品修改表-通过id查询")
-	@ApiOperation(value="付费商品修改表-通过id查询", notes="付费商品修改表-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<PayShop> queryById(@RequestParam(name="id",required=true) String id) {
-		PayShop payShop = payShopService.getById(id);
-		if(payShop==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(payShop);
-	}
-
-    /**
-    * 导出excel
-    *
-    * @param request
-    * @param payShop
-    */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, PayShop payShop) {
-        return super.exportXls(request, payShop, PayShop.class, "付费商品修改表");
-    }
-
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, PayShop.class);
-    }
-
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/entity/PayShop.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/entity/PayShop.java
deleted file mode 100644
index c736afb..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/entity/PayShop.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.jeecg.modules.payShop.entity;
-
-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.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @Description: 付费商品修改表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-@Data
-@TableName("pay_shop")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="pay_shop对象", description="付费商品修改表")
-public class PayShop implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "主键")
-    private java.lang.String id;
-	/**创建人*/
-    @ApiModelProperty(value = "创建人")
-    private java.lang.String createBy;
-	/**创建日期*/
-    @ApiModelProperty(value = "创建日期")
-    private java.util.Date createTime;
-	/**更新人*/
-    @ApiModelProperty(value = "更新人")
-    private java.lang.String updateBy;
-	/**更新日期*/
-    @ApiModelProperty(value = "更新日期")
-    private java.util.Date updateTime;
-	/**图片*/
-	@Excel(name = "图片", width = 15)
-    @ApiModelProperty(value = "图片")
-    private java.lang.String image;
-	/**标题*/
-	@Excel(name = "标题", width = 15)
-    @ApiModelProperty(value = "标题")
-    private java.lang.String title;
-	/**内容*/
-	@Excel(name = "内容", width = 15)
-    @ApiModelProperty(value = "内容")
-    private java.lang.String titleText;
-	/**级别*/
-	@Excel(name = "级别", width = 15)
-    @ApiModelProperty(value = "级别")
-    private java.lang.String classValue;
-	/**购买人数*/
-	@Excel(name = "购买人数", width = 15)
-    @ApiModelProperty(value = "购买人数")
-    private java.lang.String num;
-	/**价格*/
-	@Excel(name = "价格", width = 15)
-    @ApiModelProperty(value = "价格")
-    private java.math.BigDecimal price;
-	/**原价*/
-	@Excel(name = "原价", width = 15)
-    @ApiModelProperty(value = "原价")
-    private java.math.BigDecimal oldPrice;
-	/**资源介绍*/
-	@Excel(name = "资源介绍", width = 15)
-    @ApiModelProperty(value = "资源介绍")
-    private java.lang.String content;
-	/**资源实际内容*/
-	@Excel(name = "资源实际内容", width = 15)
-    @ApiModelProperty(value = "资源实际内容")
-    private java.lang.String conValue;
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/mapper/PayShopMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/mapper/PayShopMapper.java
deleted file mode 100644
index cff8a82..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/mapper/PayShopMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.jeecg.modules.payShop.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.payShop.entity.PayShop;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 付费商品修改表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-public interface PayShopMapper extends BaseMapper<PayShop> {
-
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/mapper/xml/PayShopMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/mapper/xml/PayShopMapper.xml
deleted file mode 100644
index c122179..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/mapper/xml/PayShopMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.payShop.mapper.PayShopMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/service/IPayShopService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/service/IPayShopService.java
deleted file mode 100644
index b898e66..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/service/IPayShopService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.jeecg.modules.payShop.service;
-
-import org.jeecg.modules.payShop.entity.PayShop;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 付费商品修改表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-public interface IPayShopService extends IService<PayShop> {
-
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/service/impl/PayShopServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/service/impl/PayShopServiceImpl.java
deleted file mode 100644
index c439274..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/service/impl/PayShopServiceImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.jeecg.modules.payShop.service.impl;
-
-import org.jeecg.modules.payShop.entity.PayShop;
-import org.jeecg.modules.payShop.mapper.PayShopMapper;
-import org.jeecg.modules.payShop.service.IPayShopService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 付费商品修改表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-@Service
-public class PayShopServiceImpl extends ServiceImpl<PayShopMapper, PayShop> implements IPayShopService {
-
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue/PayShopList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue/PayShopList.vue
deleted file mode 100644
index 7d5d19f..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue/PayShopList.vue
+++ /dev/null
@@ -1,215 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 查询区域-END -->
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <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>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        :scroll="{x:true}"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
-
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-
-    <pay-shop-modal ref="modalForm" @ok="modalFormOk"></pay-shop-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import PayShopModal from './modules/PayShopModal'
-
-  export default {
-    name: 'PayShopList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      PayShopModal
-    },
-    data () {
-      return {
-        description: '付费商品修改表管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'图片',
-            align:"center",
-            dataIndex: 'image',
-            scopedSlots: {customRender: 'imgSlot'}
-          },
-          {
-            title:'标题',
-            align:"center",
-            dataIndex: 'title'
-          },
-          {
-            title:'内容',
-            align:"center",
-            dataIndex: 'titleText'
-          },
-          {
-            title:'级别',
-            align:"center",
-            dataIndex: 'classValue'
-          },
-          {
-            title:'购买人数',
-            align:"center",
-            dataIndex: 'num'
-          },
-          {
-            title:'价格',
-            align:"center",
-            dataIndex: 'price'
-          },
-          {
-            title:'原价',
-            align:"center",
-            dataIndex: 'oldPrice'
-          },
-          {
-            title:'资源实际内容',
-            align:"center",
-            dataIndex: 'conValue'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: "/payShop/payShop/list",
-          delete: "/payShop/payShop/delete",
-          deleteBatch: "/payShop/payShop/deleteBatch",
-          exportXlsUrl: "/payShop/payShop/exportXls",
-          importExcelUrl: "payShop/payShop/importExcel",
-          
-        },
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
-    this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
-    },
-    methods: {
-      initDictConfig(){
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'image',text:'图片',dictCode:''})
-        fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
-        fieldList.push({type:'string',value:'titleText',text:'内容',dictCode:''})
-        fieldList.push({type:'string',value:'classValue',text:'级别',dictCode:''})
-        fieldList.push({type:'string',value:'num',text:'购买人数',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'oldPrice',text:'原价',dictCode:''})
-        fieldList.push({type:'Text',value:'content',text:'资源介绍',dictCode:''})
-        fieldList.push({type:'Text',value:'conValue',text:'资源实际内容',dictCode:''})
-        this.superFieldList = fieldList
-      }
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue/modules/PayShopForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue/modules/PayShopForm.vue
deleted file mode 100644
index 150fcc5..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue/modules/PayShopForm.vue
+++ /dev/null
@@ -1,144 +0,0 @@
-<template>
-  <a-spin :spinning="confirmLoading">
-    <j-form-container :disabled="formDisabled">
-      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-        <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
-              <j-image-upload isMultiple  v-model="model.image" ></j-image-upload>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
-              <a-input v-model="model.title" placeholder="请输入标题"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="内容" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="titleText">
-              <a-input v-model="model.titleText" placeholder="请输入内容"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="级别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="classValue">
-              <a-input v-model="model.classValue" placeholder="请输入级别"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="购买人数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
-              <a-input v-model="model.num" placeholder="请输入购买人数"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
-              <a-input-number v-model="model.price" placeholder="请输入价格" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="原价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="oldPrice">
-              <a-input-number v-model="model.oldPrice" placeholder="请输入原价" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="资源介绍" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="content">
-              <j-editor v-model="model.content" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="资源实际内容" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="conValue">
-              <a-input v-model="model.conValue" placeholder="请输入资源实际内容"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </j-form-container>
-  </a-spin>
-</template>
-
-<script>
-
-  import { httpAction, getAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
-
-  export default {
-    name: 'PayShopForm',
-    components: {
-    },
-    props: {
-      //表单禁用
-      disabled: {
-        type: Boolean,
-        default: false,
-        required: false
-      }
-    },
-    data () {
-      return {
-        model:{
-         },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        validatorRules: {
-        },
-        url: {
-          add: "/payShop/payShop/add",
-          edit: "/payShop/payShop/edit",
-          queryById: "/payShop/payShop/queryById"
-        }
-      }
-    },
-    computed: {
-      formDisabled(){
-        return this.disabled
-      },
-    },
-    created () {
-       //备份model原始值
-      this.modelDefault = JSON.parse(JSON.stringify(this.model));
-    },
-    methods: {
-      add () {
-        this.edit(this.modelDefault);
-      },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
-      },
-      submitForm () {
-        const that = this;
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
-          }
-         
-        })
-      },
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue/modules/PayShopModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue/modules/PayShopModal.Style#Drawer.vue
deleted file mode 100644
index 56195c9..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue/modules/PayShopModal.Style#Drawer.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <pay-shop-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></pay-shop-form>
-    <div class="drawer-footer">
-      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
-      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-
-  import PayShopForm from './PayShopForm'
-
-  export default {
-    name: 'PayShopModal',
-    components: {
-      PayShopForm
-    },
-    data () {
-      return {
-        title:"操作",
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        });
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-/** Button按钮间距 */
-  .ant-btn {
-    margin-left: 30px;
-    margin-bottom: 30px;
-    float: right;
-  }
-  .drawer-footer{
-    position: absolute;
-    bottom: -8px;
-    width: 100%;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    left: 0;
-    background: #fff;
-    border-radius: 0 0 2px 2px;
-  }
-</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue/modules/PayShopModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue/modules/PayShopModal.vue
deleted file mode 100644
index 8be2583..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue/modules/PayShopModal.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <pay-shop-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></pay-shop-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import PayShopForm from './PayShopForm'
-  export default {
-    name: 'PayShopModal',
-    components: {
-      PayShopForm
-    },
-    data () {
-      return {
-        title:'',
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue3/PayShop.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue3/PayShop.api.ts
deleted file mode 100644
index fdb5102..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue3/PayShop.api.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import {defHttp} from '/@/utils/http/axios';
-import {Modal} from 'ant-design-vue';
-
-enum Api {
-  list = '/payShop/payShop/list',
-  save='/payShop/payShop/add',
-  edit='/payShop/payShop/edit',
-  deleteOne = '/payShop/payShop/delete',
-  deleteBatch = '/payShop/payShop/deleteBatch',
-  importExcel = '/payShop/payShop/importExcel',
-  exportXls = '/payShop/payShop/exportXls',
-}
-/**
- * 导出api
- * @param params
- */
-export const getExportUrl = Api.exportXls;
-/**
- * 导入api
- */
-export const getImportUrl = Api.importExcel;
-/**
- * 列表接口
- * @param params
- */
-export const list = (params) =>
-  defHttp.get({url: Api.list, params});
-
-/**
- * 删除单个
- */
-export const deleteOne = (params,handleSuccess) => {
-  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
-    handleSuccess();
-  });
-}
-/**
- * 批量删除
- * @param params
- */
-export const batchDelete = (params, handleSuccess) => {
-  Modal.confirm({
-    title: '确认删除',
-    content: '是否删除选中数据',
-    okText: '确认',
-    cancelText: '取消',
-    onOk: () => {
-      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
-        handleSuccess();
-      });
-    }
-  });
-}
-/**
- * 保存或者更新
- * @param params
- */
-export const saveOrUpdate = (params, isUpdate) => {
-  let url = isUpdate ? Api.edit : Api.save;
-  return defHttp.post({url: url, params});
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue3/PayShop.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue3/PayShop.data.ts
deleted file mode 100644
index 94d33d1..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue3/PayShop.data.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
-import { rules} from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
-//列表数据
-export const columns: BasicColumn[] = [
-    {
-    title: '图片',
-    align:"center",
-    dataIndex: 'image',
-    customRender:render.renderAvatar,
-   },
-   {
-    title: '标题',
-    align:"center",
-    dataIndex: 'title'
-   },
-   {
-    title: '内容',
-    align:"center",
-    dataIndex: 'titleText'
-   },
-   {
-    title: '级别',
-    align:"center",
-    dataIndex: 'classValue'
-   },
-   {
-    title: '购买人数',
-    align:"center",
-    dataIndex: 'num'
-   },
-   {
-    title: '价格',
-    align:"center",
-    dataIndex: 'price'
-   },
-   {
-    title: '原价',
-    align:"center",
-    dataIndex: 'oldPrice'
-   },
-   {
-    title: '资源实际内容',
-    align:"center",
-    dataIndex: 'conValue'
-   },
-];
-//查询数据
-export const searchFormSchema: FormSchema[] = [
-];
-//表单数据
-export const formSchema: FormSchema[] = [
-  {
-    label: '图片',
-    field: 'image',
-     component: 'JImageUpload',
-     componentProps:{
-      },
-  },
-  {
-    label: '标题',
-    field: 'title',
-    component: 'Input',
-  },
-  {
-    label: '内容',
-    field: 'titleText',
-    component: 'Input',
-  },
-  {
-    label: '级别',
-    field: 'classValue',
-    component: 'Input',
-  },
-  {
-    label: '购买人数',
-    field: 'num',
-    component: 'Input',
-  },
-  {
-    label: '价格',
-    field: 'price',
-    component: 'InputNumber',
-  },
-  {
-    label: '原价',
-    field: 'oldPrice',
-    component: 'InputNumber',
-  },
-  {
-    label: '资源介绍',
-    field: 'content',
-    component: 'JCodeEditor', //TODO String后缀暂未添加
-  },
-  {
-    label: '资源实际内容',
-    field: 'conValue',
-    component: 'Input',
-  },
-];
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue3/PayShopList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue3/PayShopList.vue
deleted file mode 100644
index 8447ee0..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue3/PayShopList.vue
+++ /dev/null
@@ -1,162 +0,0 @@
-<template>
-  <div>
-    <!--引用表格-->
-   <BasicTable @register="registerTable" :rowSelection="rowSelection">
-     <!--插槽:table标题-->
-      <template #tableTitle>
-          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
-          <a-dropdown v-if="checkedKeys.length > 0">
-              <template #overlay>
-                <a-menu>
-                  <a-menu-item key="1" @click="batchHandleDelete">
-                    <Icon icon="ant-design:delete-outlined"></Icon>
-                    删除
-                  </a-menu-item>
-                </a-menu>
-              </template>
-              <a-button>批量操作
-                <Icon icon="mdi:chevron-down"></Icon>
-              </a-button>
-        </a-dropdown>
-      </template>
-       <!--操作栏-->
-      <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
-      </template>
-      <!--字段回显插槽-->
-      <template #htmlSlot="{text}">
-         <div v-html="text"></div>
-      </template>
-      <template #fileSlot="{text}">
-         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
-      </template>
-    </BasicTable>
-    <!-- 表单区域 -->
-    <PayShopModal @register="registerModal" @success="handleSuccess"></PayShopModal>
-  </div>
-</template>
-
-<script lang="ts" name="payShop-payShop" setup>
-  import {ref, computed, unref} from 'vue';
-  import {BasicTable, useTable, TableAction} from '/@/components/Table';
-  import {useModal} from '/@/components/Modal';
-  import { useListPage } from '/@/hooks/system/useListPage'
-  import PayShopModal from './components/PayShopModal.vue'
-  import {columns, searchFormSchema} from './payShop.data';
-  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './payShop.api';
-  const checkedKeys = ref<Array<string | number>>([]);
-  //注册model
-  const [registerModal, {openModal}] = useModal();
-  //注册table数据
-  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
-      tableProps:{
-           title: '付费商品修改表',
-           api: list,
-           columns,
-           canResize:false,
-           formConfig: {
-              labelWidth: 120,
-              schemas: searchFormSchema,
-              autoSubmitOnEnter:true,
-              showAdvancedButton:true,
-              fieldMapToTime: [
-              ],
-            },
-           actionColumn: {
-               width: 120,
-            },
-      },
-       exportConfig: {
-            name:"付费商品修改表",
-            url: getExportUrl,
-          },
-          importConfig: {
-            url: getImportUrl
-          },
-  })
-
-  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
-
-   /**
-    * 新增事件
-    */
-  function handleAdd() {
-     openModal(true, {
-       isUpdate: false,
-       showFooter: true,
-     });
-  }
-   /**
-    * 编辑事件
-    */
-  function handleEdit(record: Recordable) {
-     openModal(true, {
-       record,
-       isUpdate: true,
-       showFooter: true,
-     });
-   }
-   /**
-    * 详情
-   */
-  function handleDetail(record: Recordable) {
-     openModal(true, {
-       record,
-       isUpdate: true,
-       showFooter: false,
-     });
-   }
-   /**
-    * 删除事件
-    */
-  async function handleDelete(record) {
-     await deleteOne({id: record.id}, reload);
-   }
-   /**
-    * 批量删除事件
-    */
-  async function batchHandleDelete() {
-     await batchDelete({ids: checkedKeys.value}, reload);
-   }
-   /**
-    * 成功回调
-    */
-  function handleSuccess() {
-      reload();
-   }
-   /**
-      * 操作栏
-      */
-  function getTableAction(record){
-       return [
-         {
-           label: '编辑',
-           onClick: handleEdit.bind(null, record),
-         }
-       ]
-   }
-     /**
-        * 下拉操作栏
-        */
-  function getDropDownAction(record){
-      return [
-           {
-             label: '详情',
-             onClick: handleDetail.bind(null, record),
-           }, {
-             label: '删除',
-             popConfirm: {
-               title: '是否确认删除',
-               confirm: handleDelete.bind(null, record),
-             }
-           }
-      ]
-   }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue3/components/PayShopModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue3/components/PayShopModal.vue
deleted file mode 100644
index f557b7c..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue3/components/PayShopModal.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-<template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
-      <BasicForm @register="registerForm"/>
-  </BasicModal>
-</template>
-
-<script lang="ts" setup>
-    import {ref, computed, unref} from 'vue';
-    import {BasicModal, useModalInner} from '/@/components/Modal';
-    import {BasicForm, useForm} from '/@/components/Form/index';
-    import {formSchema} from '../payShop.data';
-    import {saveOrUpdate} from '../payShop.api';
-    // Emits声明
-    const emit = defineEmits(['register','success']);
-    const isUpdate = ref(true);
-    //表单配置
-    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
-        labelWidth: 150,
-        schemas: formSchema,
-        showActionButtonGroup: false,
-    });
-    //表单赋值
-    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
-        //重置表单
-        await resetFields();
-        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
-        isUpdate.value = !!data?.isUpdate;
-        if (unref(isUpdate)) {
-            //表单赋值
-            await setFieldsValue({
-                ...data.record,
-            });
-        }
-        // 隐藏底部时禁用整个表单
-       setProps({ disabled: !data?.showFooter })
-    });
-    //设置标题
-    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
-    //表单提交事件
-    async function handleSubmit(v) {
-        try {
-            let values = await validate();
-            setModalProps({confirmLoading: true});
-            //提交表单
-            await saveOrUpdate(values, isUpdate.value);
-            //关闭弹窗
-            closeModal();
-            //刷新列表
-            emit('success');
-        } finally {
-            setModalProps({confirmLoading: false});
-        }
-    }
-</script>
-
-<style lang="less" scoped>
-
-</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/controller/ShcoolFloorController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/controller/ShcoolFloorController.java
deleted file mode 100644
index e23311b..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/controller/ShcoolFloorController.java
+++ /dev/null
@@ -1,229 +0,0 @@
-package org.jeecg.modules.shcoolFloor.controller;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.shcoolFloor.entity.ShcoolFloor;
-import org.jeecg.modules.shcoolFloor.service.IShcoolFloorService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-
- /**
- * @Description: 楼栋表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-@Api(tags="楼栋表")
-@RestController
-@RequestMapping("/shcoolFloor/shcoolFloor")
-@Slf4j
-public class ShcoolFloorController extends JeecgController<ShcoolFloor, IShcoolFloorService>{
-	@Autowired
-	private IShcoolFloorService shcoolFloorService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param shcoolFloor
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "楼栋表-分页列表查询")
-	@ApiOperation(value="楼栋表-分页列表查询", notes="楼栋表-分页列表查询")
-	@GetMapping(value = "/rootList")
-	public Result<IPage<ShcoolFloor>> queryPageList(ShcoolFloor shcoolFloor,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		String hasQuery = req.getParameter("hasQuery");
-        if(hasQuery != null && "true".equals(hasQuery)){
-            QueryWrapper<ShcoolFloor> queryWrapper =  QueryGenerator.initQueryWrapper(shcoolFloor, req.getParameterMap());
-            List<ShcoolFloor> list = shcoolFloorService.queryTreeListNoPage(queryWrapper);
-            IPage<ShcoolFloor> pageList = new Page<>(1, 10, list.size());
-            pageList.setRecords(list);
-            return Result.OK(pageList);
-        }else{
-            String parentId = shcoolFloor.getPid();
-            if (oConvertUtils.isEmpty(parentId)) {
-                parentId = "0";
-            }
-            shcoolFloor.setPid(null);
-            QueryWrapper<ShcoolFloor> queryWrapper = QueryGenerator.initQueryWrapper(shcoolFloor, req.getParameterMap());
-            // 使用 eq 防止模糊查询
-            queryWrapper.eq("pid", parentId);
-            Page<ShcoolFloor> page = new Page<ShcoolFloor>(pageNo, pageSize);
-            IPage<ShcoolFloor> pageList = shcoolFloorService.page(page, queryWrapper);
-            return Result.OK(pageList);
-        }
-	}
-
-	 /**
-      * 获取子数据
-      * @param shcoolFloor
-      * @param req
-      * @return
-      */
-	//@AutoLog(value = "楼栋表-获取子数据")
-	@ApiOperation(value="楼栋表-获取子数据", notes="楼栋表-获取子数据")
-	@GetMapping(value = "/childList")
-	public Result<IPage<ShcoolFloor>> queryPageList(ShcoolFloor shcoolFloor,HttpServletRequest req) {
-		QueryWrapper<ShcoolFloor> queryWrapper = QueryGenerator.initQueryWrapper(shcoolFloor, req.getParameterMap());
-		List<ShcoolFloor> list = shcoolFloorService.list(queryWrapper);
-		IPage<ShcoolFloor> pageList = new Page<>(1, 10, list.size());
-        pageList.setRecords(list);
-		return Result.OK(pageList);
-	}
-
-    /**
-      * 批量查询子节点
-      * @param parentIds 父ID（多个采用半角逗号分割）
-      * @return 返回 IPage
-      * @param parentIds
-      * @return
-      */
-	//@AutoLog(value = "楼栋表-批量获取子数据")
-    @ApiOperation(value="楼栋表-批量获取子数据", notes="楼栋表-批量获取子数据")
-    @GetMapping("/getChildListBatch")
-    public Result getChildListBatch(@RequestParam("parentIds") String parentIds) {
-        try {
-            QueryWrapper<ShcoolFloor> queryWrapper = new QueryWrapper<>();
-            List<String> parentIdList = Arrays.asList(parentIds.split(","));
-            queryWrapper.in("pid", parentIdList);
-            List<ShcoolFloor> list = shcoolFloorService.list(queryWrapper);
-            IPage<ShcoolFloor> pageList = new Page<>(1, 10, list.size());
-            pageList.setRecords(list);
-            return Result.OK(pageList);
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            return Result.error("批量查询子节点失败：" + e.getMessage());
-        }
-    }
-	
-	/**
-	 *   添加
-	 *
-	 * @param shcoolFloor
-	 * @return
-	 */
-	@AutoLog(value = "楼栋表-添加")
-	@ApiOperation(value="楼栋表-添加", notes="楼栋表-添加")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody ShcoolFloor shcoolFloor) {
-		shcoolFloorService.addShcoolFloor(shcoolFloor);
-		return Result.OK("添加成功！");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param shcoolFloor
-	 * @return
-	 */
-	@AutoLog(value = "楼栋表-编辑")
-	@ApiOperation(value="楼栋表-编辑", notes="楼栋表-编辑")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody ShcoolFloor shcoolFloor) {
-		shcoolFloorService.updateShcoolFloor(shcoolFloor);
-		return Result.OK("编辑成功!");
-	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "楼栋表-通过id删除")
-	@ApiOperation(value="楼栋表-通过id删除", notes="楼栋表-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		shcoolFloorService.deleteShcoolFloor(id);
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "楼栋表-批量删除")
-	@ApiOperation(value="楼栋表-批量删除", notes="楼栋表-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.shcoolFloorService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功！");
-	}
-	
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "楼栋表-通过id查询")
-	@ApiOperation(value="楼栋表-通过id查询", notes="楼栋表-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<ShcoolFloor> queryById(@RequestParam(name="id",required=true) String id) {
-		ShcoolFloor shcoolFloor = shcoolFloorService.getById(id);
-		if(shcoolFloor==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(shcoolFloor);
-	}
-
-    /**
-    * 导出excel
-    *
-    * @param request
-    * @param shcoolFloor
-    */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, ShcoolFloor shcoolFloor) {
-		return super.exportXls(request, shcoolFloor, ShcoolFloor.class, "楼栋表");
-    }
-
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-		return super.importExcel(request, response, ShcoolFloor.class);
-    }
-
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/entity/ShcoolFloor.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/entity/ShcoolFloor.java
deleted file mode 100644
index 5f3bd63..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/entity/ShcoolFloor.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.jeecg.modules.shcoolFloor.entity;
-
-import java.io.Serializable;
-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.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.UnsupportedEncodingException;
-
-/**
- * @Description: 楼栋表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-@Data
-@TableName("shcool_floor")
-@ApiModel(value="shcool_floor对象", description="楼栋表")
-public class ShcoolFloor implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "主键")
-    private java.lang.String id;
-	/**创建人*/
-    @ApiModelProperty(value = "创建人")
-    private java.lang.String createBy;
-	/**创建日期*/
-    @ApiModelProperty(value = "创建日期")
-    private java.util.Date createTime;
-	/**更新人*/
-    @ApiModelProperty(value = "更新人")
-    private java.lang.String updateBy;
-	/**更新日期*/
-    @ApiModelProperty(value = "更新日期")
-    private java.util.Date updateTime;
-	/**名称*/
-	@Excel(name = "名称", width = 15)
-    @ApiModelProperty(value = "名称")
-    private java.lang.String name;
-	/**排序*/
-	@Excel(name = "排序", width = 15)
-    @ApiModelProperty(value = "排序")
-    private java.lang.Integer sort;
-	/**父级节点*/
-	@Excel(name = "父级节点", width = 15)
-    @ApiModelProperty(value = "父级节点")
-    private java.lang.String pid;
-	/**是否有子节点*/
-	@Excel(name = "是否有子节点", width = 15, dicCode = "yn")
-	@Dict(dicCode = "yn")
-    @ApiModelProperty(value = "是否有子节点")
-    private java.lang.String hasChild;
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/mapper/ShcoolFloorMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/mapper/ShcoolFloorMapper.java
deleted file mode 100644
index a8e4110..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/mapper/ShcoolFloorMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.jeecg.modules.shcoolFloor.mapper;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.shcoolFloor.entity.ShcoolFloor;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 楼栋表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-public interface ShcoolFloorMapper extends BaseMapper<ShcoolFloor> {
-
-	/**
-	 * 编辑节点状态
-	 * @param id
-	 * @param status
-	 */
-	void updateTreeNodeStatus(@Param("id") String id,@Param("status") String status);
-
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/mapper/xml/ShcoolFloorMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/mapper/xml/ShcoolFloorMapper.xml
deleted file mode 100644
index 1d46344..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/mapper/xml/ShcoolFloorMapper.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.shcoolFloor.mapper.ShcoolFloorMapper">
-
-	<update id="updateTreeNodeStatus" parameterType="java.lang.String">
-		update shcool_floor set has_child = #{status} where id = #{id}
-	</update>
-
-</mapper>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/service/IShcoolFloorService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/service/IShcoolFloorService.java
deleted file mode 100644
index 4f1a431..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/service/IShcoolFloorService.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.jeecg.modules.shcoolFloor.service;
-
-import org.jeecg.modules.shcoolFloor.entity.ShcoolFloor;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.common.exception.JeecgBootException;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import java.util.List;
-
-/**
- * @Description: 楼栋表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-public interface IShcoolFloorService extends IService<ShcoolFloor> {
-
-	/**根节点父ID的值*/
-	public static final String ROOT_PID_VALUE = "0";
-	
-	/**树节点有子节点状态值*/
-	public static final String HASCHILD = "1";
-	
-	/**树节点无子节点状态值*/
-	public static final String NOCHILD = "0";
-
-	/**新增节点*/
-	void addShcoolFloor(ShcoolFloor shcoolFloor);
-	
-	/**修改节点*/
-	void updateShcoolFloor(ShcoolFloor shcoolFloor) throws JeecgBootException;
-	
-	/**删除节点*/
-	void deleteShcoolFloor(String id) throws JeecgBootException;
-
-	/**查询所有数据，无分页*/
-    List<ShcoolFloor> queryTreeListNoPage(QueryWrapper<ShcoolFloor> queryWrapper);
-
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/service/impl/ShcoolFloorServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/service/impl/ShcoolFloorServiceImpl.java
deleted file mode 100644
index 7a05582..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/service/impl/ShcoolFloorServiceImpl.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package org.jeecg.modules.shcoolFloor.service.impl;
-
-import org.jeecg.common.exception.JeecgBootException;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.shcoolFloor.entity.ShcoolFloor;
-import org.jeecg.modules.shcoolFloor.mapper.ShcoolFloorMapper;
-import org.jeecg.modules.shcoolFloor.service.IShcoolFloorService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 楼栋表
- * @Author: jeecg-boot
- * @Date:   2024-09-02
- * @Version: V1.0
- */
-@Service
-public class ShcoolFloorServiceImpl extends ServiceImpl<ShcoolFloorMapper, ShcoolFloor> implements IShcoolFloorService {
-
-	@Override
-	public void addShcoolFloor(ShcoolFloor shcoolFloor) {
-	   //新增时设置hasChild为0
-	    shcoolFloor.setHasChild(IShcoolFloorService.NOCHILD);
-		if(oConvertUtils.isEmpty(shcoolFloor.getPid())){
-			shcoolFloor.setPid(IShcoolFloorService.ROOT_PID_VALUE);
-		}else{
-			//如果当前节点父ID不为空 则设置父节点的hasChildren 为1
-			ShcoolFloor parent = baseMapper.selectById(shcoolFloor.getPid());
-			if(parent!=null && !"1".equals(parent.getHasChild())){
-				parent.setHasChild("1");
-				baseMapper.updateById(parent);
-			}
-		}
-		baseMapper.insert(shcoolFloor);
-	}
-
-	@Override
-	public void updateShcoolFloor(ShcoolFloor shcoolFloor) {
-//		ShcoolFloor entity = this.getById(shcoolFloor.getId());
-//		if(entity==null) {
-//			throw new JeecgBootException("未找到对应实体");
-//		}
-//		String old_pid = entity.getPid();
-//		String new_pid = shcoolFloor.getPid();
-//		if(!old_pid.equals(new_pid)) {
-//			updateOldParentNode(old_pid);
-//			if(oConvertUtils.isEmpty(new_pid)){
-//				shcoolFloor.setPid(IShcoolFloorService.ROOT_PID_VALUE);
-//			}
-//			if(!IShcoolFloorService.ROOT_PID_VALUE.equals(shcoolFloor.getPid())) {
-//				baseMapper.updateTreeNodeStatus(shcoolFloor.getPid(), IShcoolFloorService.HASCHILD);
-//			}
-//		}
-//		baseMapper.updateById(shcoolFloor);
-	}
-
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public void deleteShcoolFloor(String id) throws JeecgBootException {
-//		//查询选中节点下所有子节点一并删除
-//        id = this.queryTreeChildIds(id);
-//        if(id.indexOf(",")>0) {
-//            StringBuffer sb = new StringBuffer();
-//            String[] idArr = id.split(",");
-//            for (String idVal : idArr) {
-//                if(idVal != null){
-//                    ShcoolFloor shcoolFloor = this.getById(idVal);
-//                    String pidVal = shcoolFloor.getPid();
-//                    //查询此节点上一级是否还有其他子节点
-//                    List<ShcoolFloor> dataList = baseMapper.selectList(new QueryWrapper<ShcoolFloor>().eq("pid", pidVal).notIn("id",Arrays.asList(idArr)));
-//                    if((dataList == null || dataList.size()==0) && !Arrays.asList(idArr).contains(pidVal)
-//                            && !sb.toString().contains(pidVal)){
-//                        //如果当前节点原本有子节点 现在木有了，更新状态
-//                        sb.append(pidVal).append(",");
-//                    }
-//                }
-//            }
-//            //批量删除节点
-//            baseMapper.deleteBatchIds(Arrays.asList(idArr));
-//            //修改已无子节点的标识
-//            String[] pidArr = sb.toString().split(",");
-//            for(String pid : pidArr){
-//                this.updateOldParentNode(pid);
-//            }
-//        }else{
-//            ShcoolFloor shcoolFloor = this.getById(id);
-//            if(shcoolFloor==null) {
-//                throw new JeecgBootException("未找到对应实体");
-//            }
-//            updateOldParentNode(shcoolFloor.getPid());
-//            baseMapper.deleteById(id);
-//        }
-	}
-
-	@Override
-    public List<ShcoolFloor> queryTreeListNoPage(QueryWrapper<ShcoolFloor> queryWrapper) {
-        List<ShcoolFloor> dataList = baseMapper.selectList(queryWrapper);
-        List<ShcoolFloor> mapList = new ArrayList<>();
-        for(ShcoolFloor data : dataList){
-            String pidVal = data.getPid();
-            //递归查询子节点的根节点
-            if(pidVal != null && !"0".equals(pidVal)){
-                ShcoolFloor rootVal = this.getTreeRoot(pidVal);
-                if(rootVal != null && !mapList.contains(rootVal)){
-                    mapList.add(rootVal);
-                }
-            }else{
-                if(!mapList.contains(data)){
-                    mapList.add(data);
-                }
-            }
-        }
-        return mapList;
-    }
-
-//	/**
-//	 * 根据所传pid查询旧的父级节点的子节点并修改相应状态值
-//	 * @param pid
-//	 */
-//	private void updateOldParentNode(String pid) {
-//		if(!IShcoolFloorService.ROOT_PID_VALUE.equals(pid)) {
-//			Integer count = baseMapper.selectCount(new QueryWrapper<ShcoolFloor>().eq("pid", pid));
-//			if(count==null || count<=1) {
-//				baseMapper.updateTreeNodeStatus(pid, IShcoolFloorService.NOCHILD);
-//			}
-//		}
-//	}
-
-	/**
-     * 递归查询节点的根节点
-     * @param pidVal
-     * @return
-     */
-    private ShcoolFloor getTreeRoot(String pidVal){
-        ShcoolFloor data =  baseMapper.selectById(pidVal);
-        if(data != null && !"0".equals(data.getPid())){
-            return this.getTreeRoot(data.getPid());
-        }else{
-            return data;
-        }
-    }
-
-    /**
-     * 根据id查询所有子节点id
-     * @param ids
-     * @return
-     */
-    private String queryTreeChildIds(String ids) {
-        //获取id数组
-        String[] idArr = ids.split(",");
-        StringBuffer sb = new StringBuffer();
-        for (String pidVal : idArr) {
-            if(pidVal != null){
-                if(!sb.toString().contains(pidVal)){
-                    if(sb.toString().length() > 0){
-                        sb.append(",");
-                    }
-                    sb.append(pidVal);
-                    this.getTreeChildIds(pidVal,sb);
-                }
-            }
-        }
-        return sb.toString();
-    }
-
-    /**
-     * 递归查询所有子节点
-     * @param pidVal
-     * @param sb
-     * @return
-     */
-    private StringBuffer getTreeChildIds(String pidVal,StringBuffer sb){
-        List<ShcoolFloor> dataList = baseMapper.selectList(new QueryWrapper<ShcoolFloor>().eq("pid", pidVal));
-        if(dataList != null && dataList.size()>0){
-            for(ShcoolFloor tree : dataList) {
-                if(!sb.toString().contains(tree.getId())){
-                    sb.append(",").append(tree.getId());
-                }
-                this.getTreeChildIds(tree.getId(),sb);
-            }
-        }
-        return sb;
-    }
-
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue/ShcoolFloorList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue/ShcoolFloorList.vue
deleted file mode 100644
index 18e67c5..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue/ShcoolFloorList.vue
+++ /dev/null
@@ -1,353 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 查询区域-END -->
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <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>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        rowKey="id"
-        class="j-table-force-nowrap"
-        :scroll="{x:true}"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :expandedRowKeys="expandedRowKeys"
-        @change="handleTableChange"
-        @expand="handleExpand"
-        v-bind="tableProps">
-
-        <template slot="imgSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleAddChild(record)">添加下级</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDeleteNode(record.id)" placement="topLeft">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-
-    <shcoolFloor-modal ref="modalForm" @ok="modalFormOk"></shcoolFloor-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import { getAction, deleteAction } from '@/api/manage'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import ShcoolFloorModal from './modules/ShcoolFloorModal'
-  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-  import { filterObj } from '@/utils/util';
-
-  export default {
-    name: "ShcoolFloorList",
-    mixins:[JeecgListMixin],
-    components: {
-      ShcoolFloorModal
-    },
-    data () {
-      return {
-        description: '楼栋表管理页面',
-        // 表头
-        columns: [
-          {
-            title:'名称',
-            align:"left",
-            dataIndex: 'name'
-          },
-          {
-            title:'排序',
-            align:"left",
-            dataIndex: 'sort'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' },
-          }
-        ],
-        url: {
-          list: "/shcoolFloor/shcoolFloor/rootList",
-          childList: "/shcoolFloor/shcoolFloor/childList",
-          getChildListBatch: "/shcoolFloor/shcoolFloor/getChildListBatch",
-          delete: "/shcoolFloor/shcoolFloor/delete",
-          deleteBatch: "/shcoolFloor/shcoolFloor/deleteBatch",
-          exportXlsUrl: "/shcoolFloor/shcoolFloor/exportXls",
-          importExcelUrl: "shcoolFloor/shcoolFloor/importExcel",
-        },
-        expandedRowKeys:[],
-        hasChildrenField:"hasChild",
-        pidField:"pid",
-        dictOptions: {},
-        loadParent: false,
-        superFieldList:[],
-      }
-    },
-    created() {
-      this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
-      tableProps() {
-        let _this = this
-        return {
-          // 列表项是否可选择
-          rowSelection: {
-            selectedRowKeys: _this.selectedRowKeys,
-            onChange: (selectedRowKeys) => _this.selectedRowKeys = selectedRowKeys
-          }
-        }
-      }
-    },
-    methods: {
-      loadData(arg){
-        if(arg==1){
-          this.ipagination.current=1
-        }
-        this.loading = true
-        let params = this.getQueryParams()
-        params.hasQuery = 'true'
-        getAction(this.url.list,params).then(res=>{
-          if(res.success){
-            let result = res.result
-            if(Number(result.total)>0){
-              this.ipagination.total = Number(result.total)
-              this.dataSource = this.getDataByResult(res.result.records)
-              return this.loadDataByExpandedRows(this.dataSource)
-            }else{
-              this.ipagination.total=0
-              this.dataSource=[]
-            }
-          }else{
-            this.$message.warning(res.message)
-          }
-        }).finally(()=>{
-          this.loading = false
-        })
-      },
-      // 根据已展开的行查询数据（用于保存后刷新时异步加载子级的数据）
-      loadDataByExpandedRows(dataList) {
-        if (this.expandedRowKeys.length > 0) {
-          return getAction(this.url.getChildListBatch,{ parentIds: this.expandedRowKeys.join(',') }).then(res=>{
-            if (res.success && res.result.records.length>0) {
-              //已展开的数据批量子节点
-              let records = res.result.records
-              const listMap = new Map();
-              for (let item of records) {
-                let pid = item[this.pidField];
-                if (this.expandedRowKeys.join(',').includes(pid)) {
-                 let mapList = listMap.get(pid);
-                  if (mapList == null) {
-                    mapList = [];
-                  }
-                  mapList.push(item);
-                  listMap.set(pid, mapList);
-                }
-              }
-              let childrenMap = listMap;
-              let fn = (list) => {
-                if(list) {
-                  list.forEach(data => {
-                    if (this.expandedRowKeys.includes(data.id)) {
-                      data.children = this.getDataByResult(childrenMap.get(data.id))
-                      fn(data.children)
-                    }
-                  })
-                }
-              }
-              fn(dataList)
-            }
-          })
-        } else {
-          return Promise.resolve()
-        }
-      },
-      getQueryParams(arg) {
-        //获取查询条件
-        let sqp = {}
-        let param = {}
-        if(this.superQueryParams){
-          sqp['superQueryParams']=encodeURI(this.superQueryParams)
-          sqp['superQueryMatchType'] = this.superQueryMatchType
-        }
-        if(arg){
-          param = Object.assign(sqp, this.isorter ,this.filters);
-        }else{
-          param = Object.assign(sqp, this.queryParam, this.isorter ,this.filters);
-        }
-        if(JSON.stringify(this.queryParam) === "{}" || arg){
-          param.hasQuery = 'false'
-        }else{
-          param.hasQuery = 'true'
-        }
-        param.field = this.getQueryField();
-        param.pageNo = this.ipagination.current;
-        param.pageSize = this.ipagination.pageSize;
-        return filterObj(param);
-      },
-      searchReset() {
-        //重置
-        this.expandedRowKeys = []
-        this.queryParam = {}
-        this.loadData(1);
-      },
-      getDataByResult(result){
-        if(result){
-          return result.map(item=>{
-            //判断是否标记了带有子节点
-            if(item[this.hasChildrenField]=='1'){
-              let loadChild = { id: item.id+'_loadChild', name: 'loading...', isLoading: true }
-              item.children = [loadChild]
-            }
-            return item
-          })
-        }
-      },
-      handleExpand(expanded, record){
-        // 判断是否是展开状态
-        if (expanded) {
-          this.expandedRowKeys.push(record.id)
-          if (record.children.length>0 && record.children[0].isLoading === true) {
-            let params = this.getQueryParams(1);//查询条件
-            params[this.pidField] = record.id
-            params.hasQuery = 'false'
-            params.superQueryParams=""
-            getAction(this.url.childList,params).then((res)=>{
-              if(res.success){
-                if(res.result.records){
-                  record.children = this.getDataByResult(res.result.records)
-                  this.dataSource = [...this.dataSource]
-                }else{
-                  record.children=''
-                  record.hasChildrenField='0'
-                }
-              }else{
-                this.$message.warning(res.message)
-              }
-            })
-          }
-        }else{
-          let keyIndex = this.expandedRowKeys.indexOf(record.id)
-          if(keyIndex>=0){
-            this.expandedRowKeys.splice(keyIndex, 1);
-          }
-        }
-      },
-      handleAddChild(record){
-        this.loadParent = true
-        let obj = {}
-        obj[this.pidField] = record['id']
-        this.$refs.modalForm.add(obj);
-      },
-      handleDeleteNode(id) {
-        if(!this.url.delete){
-          this.$message.error("请设置url.delete属性!")
-          return
-        }
-        var that = this;
-        deleteAction(that.url.delete, {id: id}).then((res) => {
-          if (res.success) {
-             that.loadData(1)
-          } else {
-            that.$message.warning(res.message);
-          }
-        });
-      },
-      batchDel(){
-        if(this.selectedRowKeys.length<=0){
-          this.$message.warning('请选择一条记录！');
-          return false;
-        }else{
-          let ids = "";
-          let that = this;
-          that.selectedRowKeys.forEach(function(val) {
-            ids+=val+",";
-          });
-          that.$confirm({
-            title:"确认删除",
-            content:"是否删除选中数据?",
-            onOk: function(){
-              that.handleDeleteNode(ids)
-              that.onClearSelected();
-            }
-          });
-        }
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'name',text:'名称',dictCode:''})
-        fieldList.push({type:'int',value:'sort',text:'排序',dictCode:''})
-        fieldList.push({type:'string',value:'pid',text:'父级节点',dictCode:''})
-        this.superFieldList = fieldList
-      }
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue/modules/ShcoolFloorModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue/modules/ShcoolFloorModal.vue
deleted file mode 100644
index f55bdc4..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue/modules/ShcoolFloorModal.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    switchFullscreen
-    @ok="handleOk"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <a-spin :spinning="confirmLoading">
-      <a-form-model ref="form" :model="model" :rules="validatorRules">
-        <a-form-model-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
-          <a-input v-model="model.name" placeholder="请输入名称" ></a-input>
-        </a-form-model-item>
-        <a-form-model-item label="排序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sort">
-          <a-input-number v-model="model.sort" placeholder="请输入排序" style="width: 100%" />
-        </a-form-model-item>
-        <a-form-model-item label="父级节点" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pid">
-          <j-tree-select
-            ref="treeSelect"
-            placeholder="请选择父级节点"
-            v-model="model.pid"
-            dict="shcool_floor,name,id"
-            pidField="pid"
-            pidValue="0"
-            hasChildField="has_child"
-            >
-          </j-tree-select>
-        </a-form-model-item>
-        
-      </a-form-model>
-    </a-spin>
-  </j-modal>
-</template>
-
-<script>
-
-  import { httpAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
-  export default {
-    name: "ShcoolFloorModal",
-    components: { 
-    },
-    data () {
-      return {
-        title:"操作",
-        width:800,
-        visible: false,
-        model:{
-         },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-
-        confirmLoading: false,
-        validatorRules: {
-        },
-        url: {
-          add: "/shcoolFloor/shcoolFloor/add",
-          edit: "/shcoolFloor/shcoolFloor/edit",
-        },
-        expandedRowKeys:[],
-        pidField:"pid"
-     
-      }
-    },
-    created () {
-       //备份model原始值
-       this.modelDefault = JSON.parse(JSON.stringify(this.model));
-    },
-    methods: {
-      add (obj) {
-        this.modelDefault.pid=''
-        this.edit(Object.assign(this.modelDefault , obj));
-      },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-        this.$refs.form.clearValidate()
-      },
-      handleOk () {
-        const that = this;
-        // 触发表单验证
-       this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-             if(this.model.id && this.model.id === this.model[this.pidField]){
-              that.$message.warning("父级节点不能选择自己");
-              that.confirmLoading = false;
-              return;
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                this.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-              that.close();
-            })
-          }else{
-             return false
-          }
-        })
-      },
-      handleCancel () {
-        this.close()
-      },
-      submitSuccess(formData,flag){
-        if(!formData.id){
-          let treeData = this.$refs.treeSelect.getCurrTreeData()
-          this.expandedRowKeys=[]
-          this.getExpandKeysByPid(formData[this.pidField],treeData,treeData)
-          this.$emit('ok',formData,this.expandedRowKeys.reverse());
-        }else{
-          this.$emit('ok',formData,flag);
-        }
-      },
-      getExpandKeysByPid(pid,arr,all){
-        if(pid && arr && arr.length>0){
-          for(let i=0;i<arr.length;i++){
-            if(arr[i].key==pid){
-              this.expandedRowKeys.push(arr[i].key)
-              this.getExpandKeysByPid(arr[i]['parentId'],all,all)
-            }else{
-              this.getExpandKeysByPid(pid,arr[i].children,all)
-            }
-          }
-        }
-      }
-      
-      
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/ShcoolFloor.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/ShcoolFloor.api.ts
deleted file mode 100644
index a0ce0fc..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/ShcoolFloor.api.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import {defHttp} from "/@/utils/http/axios";
-import {Modal} from 'ant-design-vue';
-
-enum Api {
-  list = '/shcoolFloor/shcoolFloor/rootList',
-  save='/shcoolFloor/shcoolFloor/add',
-  edit='/shcoolFloor/shcoolFloor/edit',
-  deleteShcoolFloor = '/sys/shcoolFloor/delete',
-  deleteBatch = '/shcoolFloor/shcoolFloor/deleteBatch',
-  importExcel = '/shcoolFloor/shcoolFloor/importExcel',
-  exportXls = '/shcoolFloor/shcoolFloor/exportXls',
-  loadTreeData = '/shcoolFloor/shcoolFloor/loadTreeRoot',
-  getChildList = '/shcoolFloor/shcoolFloor/childList',
-  getChildListBatch = '/shcoolFloor/shcoolFloor/getChildListBatch',
-}
-/**
- * 导出api
- * @param params
- */
-export const getExportUrl = Api.exportXls;
-/**
- * 导入api
- * @param params
- */
-export const getImportUrl = Api.importExcel;
-/**
- * 列表接口
- * @param params
- */
-export const list = (params) =>
-  defHttp.get({url: Api.list, params});
-/**
- * 删除
- */
-export const deleteShcoolFloor = (params,handleSuccess) => {
-  return defHttp.delete({url: Api.deleteShcoolFloor, params}, {joinParamsToUrl: true}).then(() => {
-    handleSuccess();
-  });
-}
-/**
- * 批量删除
- * @param params
- */
-export const batchDeleteShcoolFloor = (params, handleSuccess) => {
-  Modal.confirm({
-    title: '确认删除',
-    content: '是否删除选中数据',
-    okText: '确认',
-    cancelText: '取消',
-    onOk: () => {
-      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
-        handleSuccess();
-      });
-    }
-  });
-}
-/**
- * 保存或者更新
- * @param params
- */
-export const saveOrUpdateDict = (params, isUpdate) => {
-  let url = isUpdate ? Api.edit : Api.save;
-  return defHttp.post({url: url, params});
-}
-/**
- * 查询全部树形节点数据
- * @param params
- */
-export const loadTreeData = (params) =>
-  defHttp.get({url: Api.loadTreeData,params});
-/**
- * 查询子节点数据
- * @param params
- */
-export const getChildList = (params) =>
-  defHttp.get({url: Api.getChildList, params});
-/**
- * 批量查询子节点数据
- * @param params
- */
-export const getChildListBatch = (params) =>
-  defHttp.get({url: Api.getChildListBatch, params},{isTransformResponse:false});
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/ShcoolFloor.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/ShcoolFloor.data.ts
deleted file mode 100644
index d6c3444..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/ShcoolFloor.data.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
-import { rules} from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
-//列表数据
-export const columns: BasicColumn[] = [
-    {
-    title: '名称',
-    align:"center",
-    dataIndex: 'name'
-   },
-   {
-    title: '排序',
-    align:"center",
-    dataIndex: 'sort'
-   },
-];
-//查询数据
-export const searchFormSchema: FormSchema[] = [
-];
-//表单数据
-export const formSchema: FormSchema[] = [
-  {
-    label: '名称',
-    field: 'name',
-    component: 'Input',
-  },
-  {
-    label: '排序',
-    field: 'sort',
-    component: 'InputNumber',
-  },
-  {
-    label: '父级节点',
-    field: 'pid',
-    component: 'Input',
-  },
-];
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/ShcoolFloorList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/ShcoolFloorList.vue
deleted file mode 100644
index d4553de..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/ShcoolFloorList.vue
+++ /dev/null
@@ -1,272 +0,0 @@
-<template>
-  <div class="p-4">
-    <!--引用表格-->
-    <BasicTable @register="registerTable" :rowSelection="rowSelection" :expandedRowKeys="expandedRowKeys" @expand="handleExpand" @fetch-success="onFetchSuccess">
-      <!--插槽:table标题-->
-      <template #tableTitle>
-          <a-button type="primary" @click="handleCreate" preIcon="ant-design:plus-outlined"> 新增</a-button>
-          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
-
-          <a-dropdown v-if="selectedRowKeys.length > 0">
-          <template #overlay>
-            <a-menu>
-              <a-menu-item key="1" @click="batchHandleDelete">
-                <Icon icon="ant-design:delete-outlined"></Icon>
-                删除
-              </a-menu-item>
-            </a-menu>
-          </template>
-          <a-button>批量操作
-            <Icon icon="ant-design:down-outlined"></Icon>
-          </a-button>
-        </a-dropdown>
-      </template>
-      <!--操作栏-->
-      <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)"/>
-      </template>
-    </BasicTable>
-    <!--字典弹窗-->
-    <ShcoolFloorModal @register="registerModal" @success="handleSuccess"/>
-  </div>
-</template>
-
-<script lang="ts" name="shcoolFloor-shcoolFloor" setup>
-  //ts语法
-  import {ref, computed, unref, toRaw, nextTick} from 'vue';
-  import {BasicTable, useTable, TableAction} from '/src/components/Table';
-  import {useModal} from '/src/components/Modal';
-  import { useListPage } from '/@/hooks/system/useListPage'
-  import ShcoolFloorModal from './components/ShcoolFloorModal.vue';
-  import {columns} from './ShcoolFloor.data';
-  import {list, deleteShcoolFloor, batchDeleteShcoolFloor, getExportUrl,getImportUrl, getChildList,getChildListBatch} from './ShcoolFloor.api';
-
-  const expandedRowKeys = ref([]);
-  //字典model
-  const [registerModal, {openModal}] = useModal();
-   //注册table数据
-  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
-    tableProps:{
-         title: '楼栋表',
-         columns,
-         canResize:false,
-         actionColumn: {
-             width: 120,
-          },
-    },
-     exportConfig: {
-          name:"楼栋表",
-          url: getExportUrl,
-        },
-        importConfig: {
-          url: getImportUrl,
-          success: importSuccess
-        },
-    })
-
-  const [registerTable, {reload, collapseAll, updateTableDataRecord, findTableDataRecord,getDataSource},{ rowSelection, selectedRowKeys }] = tableContext
-
-  /**
-   * 新增事件
-   */
-  function handleCreate() {
-    openModal(true, {
-      isUpdate: false,
-    });
-  }
-
-  /**
-   * 编辑事件
-   */
-  async function handleEdit(record) {
-    openModal(true, {
-      record,
-      isUpdate: true,
-    });
-  }
-
-  /**
-   * 详情
-   */
-  async function handleDetail(record) {
-    openModal(true, {
-      record,
-      isUpdate: true,
-      hideFooter: true,
-    });
-  }
-
-  /**
-   * 删除事件
-   */
-  async function handleDelete(record) {
-    await deleteShcoolFloor({id: record.id}, importSuccess);
-  }
-
-  /**
-   * 批量删除事件
-   */
-  async function batchHandleDelete() {
-    const ids = selectedRowKeys.value.filter(item => !item.includes('loading'))
-    await batchDeleteShcoolFloor({ids: ids}, importSuccess);
-  }
-  /**
-   * 导入
-   */
-   function importSuccess() {
-    reload() && (expandedRowKeys.value = []);
-  }
-  /**
-   * 添加下级
-   */
-  function handleAddSub(record) {
-    openModal(true, {
-      record,
-      isUpdate: false,
-    });
-  }
-  /**
-   * 成功回调
-   */
-  async function handleSuccess({isUpdate, values, expandedArr}) {
-    if (isUpdate) {
-      //编辑回调
-      updateTableDataRecord(values.id, values);
-    } else {
-        if(!values['pid']){
-            //新增根节点
-            reload();
-        }else{
-            //新增子集
-            expandedRowKeys.value = [];
-            for (let key of unref(expandedArr)) {
-                await expandTreeNode(key)
-            }
-        }
-    }
-  }
-
-  /**
-   * 接口请求成功后回调
-   */
-  function onFetchSuccess(result) {
-      getDataByResult(result.items)&&loadDataByExpandedRows();
-  }
-  /**
-   * 根据已展开的行查询数据（用于保存后刷新时异步加载子级的数据）
-   */
-  async function loadDataByExpandedRows() {
-      if (unref(expandedRowKeys).length > 0) {
-          const res = await getChildListBatch({ parentIds: unref(expandedRowKeys).join(',')});
-          if (res.success && res.result.records.length>0) {
-              //已展开的数据批量子节点
-              let records = res.result.records
-              const listMap = new Map();
-              for (let item of records) {
-                  let pid = item['pid'];
-                  if (unref(expandedRowKeys).includes(pid)) {
-                      let mapList = listMap.get(pid);
-                      if (mapList == null) {
-                          mapList = [];
-                      }
-                      mapList.push(item);
-                      listMap.set(pid, mapList);
-                  }
-              }
-              let childrenMap = listMap;
-              let fn = (list) => {
-                  if(list) {
-                      list.forEach(data => {
-                          if (unref(expandedRowKeys).includes(data.id)) {
-                              data.children = getDataByResult(childrenMap.get(data.id))
-                              fn(data.children)
-                          }
-                      })
-                  }
-              };
-              fn(getDataSource())
-          }
-      }
-  }
-  /**
-   * 处理数据集
-   */
-  function getDataByResult(result){
-      if(result && result.length>0){
-          return result.map(item=>{
-              //判断是否标记了带有子节点
-              if(item["hasChild"]=='1'){
-                  let loadChild = { id: item.id+'_loadChild', name: 'loading...', isLoading: true }
-                  item.children = [loadChild]
-              }
-              return item
-          })
-      }
-  }
-  /**
-   *树节点展开合并
-   * */
-  async function handleExpand(expanded, record) {
-    // 判断是否是展开状态，展开状态(expanded)并且存在子集(children)并且未加载过(isLoading)的就去查询子节点数据
-    if (expanded) {
-       expandedRowKeys.value.push(record.id)
-      if (record.children.length > 0 && !!record.children[0].isLoading) {
-        let result = await getChildList({pid: record.id});
-        result=result.records?result.records:result;
-        if (result && result.length > 0) {
-          record.children = getDataByResult(result);
-        } else {
-          record.children = null
-          record.hasChild = '0'
-        }
-      }
-    } else {
-      let keyIndex = expandedRowKeys.value.indexOf(record.id)
-      if (keyIndex >= 0) {
-        expandedRowKeys.value.splice(keyIndex, 1);
-      }
-    }
-  }
-  /**
-   *操作表格后处理树节点展开合并
-   * */
-  async function expandTreeNode(key) {
-    let record = findTableDataRecord(key)
-    expandedRowKeys.value.push(key);
-      let result = await getChildList({pid: key});
-      if (result && result.length > 0) {
-          record.children = getDataByResult(result);
-      } else {
-          record.children = null
-          record.hasChild = '0'
-      }
-      updateTableDataRecord(key, record);
-  }
-  /**
-   * 操作栏
-   */
-  function getTableAction(record) {
-    return [
-      {
-        label: '编辑',
-        onClick: handleEdit.bind(null, record),
-      },
-      {
-        label: '删除',
-        popConfirm: {
-          title: '确定删除吗?',
-          confirm: handleDelete.bind(null, record),
-        },
-      },
-      {
-        label: '添加下级',
-        onClick: handleAddSub.bind(null, {pid: record.id}),
-      }
-    ]
-  }
-</script>
-
-<style scoped>
-
-</style>
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/components/ShcoolFloorModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/components/ShcoolFloorModal.vue
deleted file mode 100644
index eb9b90b..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/components/ShcoolFloorModal.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="getTitle" @ok="handleSubmit">
-    <BasicForm @register="registerForm"/>
-  </BasicModal>
-</template>
-<script lang="ts" setup>
-  import {ref, computed, unref} from 'vue';
-  import {BasicModal, useModalInner} from '/src/components/Modal';
-  import {BasicForm, useForm} from '/src/components/Form';
-  import {formSchema} from '../shcoolFloor.data';
-  import {loadTreeData, saveOrUpdateDict} from '../shcoolFloor.api';
-  // 获取emit
-  const emit = defineEmits(['register', 'success']);
-  const isUpdate = ref(true);
-  const expandedRowKeys = ref([]);
-  const treeData = ref([]);
-  //表单配置
-  const [registerForm, {resetFields, setFieldsValue, validate, updateSchema}] = useForm({
-    schemas: formSchema,
-    showActionButtonGroup: false,
-    labelCol: {
-      xs: { span: 24 },
-      sm: { span: 4 },
-    },
-    wrapperCol: {
-      xs: { span: 24 },
-      sm: { span: 18 },
-    },
-  });
-  //表单赋值
-  const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
-    //重置表单
-    await resetFields();
-    expandedRowKeys.value = [];
-    setModalProps({confirmLoading: false, minHeight: 80});
-    isUpdate.value = !!data?.isUpdate;
-    if (data?.record) {
-      //表单赋值
-      await setFieldsValue({
-        ...data.record,
-      });
-    }
-    //父级节点树信息
-    treeData.value = await loadTreeData({'async': false,'pcode':''});
-    updateSchema({
-      field: 'pid',
-      componentProps: {treeData},
-    });
-  });
-  //设置标题
-  const getTitle = computed(() => (!unref(isUpdate) ? '新增字典' : '编辑字典'));
-
-  /**
-   * 根据pid获取展开的节点
-   * @param pid
-   * @param arr
-   */
-  function getExpandKeysByPid(pid,arr){
-    if(pid && arr && arr.length>0){
-      for(let i=0;i<arr.length;i++){
-        if(arr[i].key==pid && unref(expandedRowKeys).indexOf(pid)<0){
-          expandedRowKeys.value.push(arr[i].key);
-          getExpandKeysByPid(arr[i]['parentId'],unref(treeData))
-        }else{
-          getExpandKeysByPid(pid,arr[i].children)
-        }
-      }
-    }
-  }
-  //表单提交事件
-  async function handleSubmit() {
-    try {
-      let values = await validate();
-      setModalProps({confirmLoading: true});
-      //提交表单
-      await saveOrUpdateDict(values, isUpdate.value);
-      //关闭弹窗
-      closeModal();
-      //展开的节点信息
-      await getExpandKeysByPid(values['pid'],unref(treeData))
-      //刷新列表(isUpdate:是否编辑;values:表单信息;expandedArr:展开的节点信息)
-      emit('success', {isUpdate: unref(isUpdate), values:{...values},expandedArr: unref(expandedRowKeys).reverse()});
-    } finally {
-      setModalProps({confirmLoading: false});
-    }
-  }
-</script>
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/controller/ShcoolSubController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/controller/ShcoolSubController.java
deleted file mode 100644
index 9c880f4..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/controller/ShcoolSubController.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package org.jeecg.modules.shcoolSub.controller;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.shcoolSub.entity.ShcoolSub;
-import org.jeecg.modules.shcoolSub.service.IShcoolSubService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-
- /**
- * @Description: 报修表
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-@Api(tags="报修表")
-@RestController
-@RequestMapping("/shcoolSub/shcoolSub")
-@Slf4j
-public class ShcoolSubController extends JeecgController<ShcoolSub, IShcoolSubService> {
-	@Autowired
-	private IShcoolSubService shcoolSubService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param shcoolSub
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "报修表-分页列表查询")
-	@ApiOperation(value="报修表-分页列表查询", notes="报修表-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<ShcoolSub>> queryPageList(ShcoolSub shcoolSub,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<ShcoolSub> queryWrapper = QueryGenerator.initQueryWrapper(shcoolSub, req.getParameterMap());
-		Page<ShcoolSub> page = new Page<ShcoolSub>(pageNo, pageSize);
-		IPage<ShcoolSub> pageList = shcoolSubService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	
-	/**
-	 *   添加
-	 *
-	 * @param shcoolSub
-	 * @return
-	 */
-	@AutoLog(value = "报修表-添加")
-	@ApiOperation(value="报修表-添加", notes="报修表-添加")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody ShcoolSub shcoolSub) {
-		shcoolSubService.save(shcoolSub);
-		return Result.OK("添加成功！");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param shcoolSub
-	 * @return
-	 */
-	@AutoLog(value = "报修表-编辑")
-	@ApiOperation(value="报修表-编辑", notes="报修表-编辑")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody ShcoolSub shcoolSub) {
-		shcoolSubService.updateById(shcoolSub);
-		return Result.OK("编辑成功!");
-	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "报修表-通过id删除")
-	@ApiOperation(value="报修表-通过id删除", notes="报修表-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		shcoolSubService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "报修表-批量删除")
-	@ApiOperation(value="报修表-批量删除", notes="报修表-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.shcoolSubService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-	
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "报修表-通过id查询")
-	@ApiOperation(value="报修表-通过id查询", notes="报修表-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<ShcoolSub> queryById(@RequestParam(name="id",required=true) String id) {
-		ShcoolSub shcoolSub = shcoolSubService.getById(id);
-		if(shcoolSub==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(shcoolSub);
-	}
-
-    /**
-    * 导出excel
-    *
-    * @param request
-    * @param shcoolSub
-    */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, ShcoolSub shcoolSub) {
-        return super.exportXls(request, shcoolSub, ShcoolSub.class, "报修表");
-    }
-
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, ShcoolSub.class);
-    }
-
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/entity/ShcoolSub.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/entity/ShcoolSub.java
deleted file mode 100644
index a7ab016..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/entity/ShcoolSub.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package org.jeecg.modules.shcoolSub.entity;
-
-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.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @Description: 报修表
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-@Data
-@TableName("shcool_sub")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="shcool_sub对象", description="报修表")
-public class ShcoolSub implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "主键")
-    private java.lang.String id;
-	/**创建人*/
-    @ApiModelProperty(value = "创建人")
-    private java.lang.String createBy;
-	/**创建日期*/
-    @ApiModelProperty(value = "创建日期")
-    private java.util.Date createTime;
-	/**更新人*/
-    @ApiModelProperty(value = "更新人")
-    private java.lang.String updateBy;
-	/**更新日期*/
-    @ApiModelProperty(value = "更新日期")
-    private java.util.Date updateTime;
-	/**楼栋*/
-	@Excel(name = "楼栋", width = 15)
-    @ApiModelProperty(value = "楼栋")
-    private java.lang.String building;
-	/**室号*/
-	@Excel(name = "室号", width = 15)
-    @ApiModelProperty(value = "室号")
-    private java.lang.String room;
-	/**项目*/
-	@Excel(name = "项目", width = 15)
-    @ApiModelProperty(value = "项目")
-    private java.lang.String project;
-	/**姓名*/
-	@Excel(name = "姓名", width = 15)
-    @ApiModelProperty(value = "姓名")
-    private java.lang.String name;
-	/**简介*/
-	@Excel(name = "简介", width = 15)
-    @ApiModelProperty(value = "简介")
-    private java.lang.String context;
-	/**电话*/
-	@Excel(name = "电话", width = 15)
-    @ApiModelProperty(value = "电话")
-    private java.lang.String phone;
-	/**照片*/
-	@Excel(name = "照片", width = 15)
-    @ApiModelProperty(value = "照片")
-    private java.lang.String image;
-	/**用户标识*/
-	@Excel(name = "用户标识", width = 15)
-    @ApiModelProperty(value = "用户标识")
-    private java.lang.String userId;
-	/**状态*/
-	@Excel(name = "状态", width = 15)
-    @ApiModelProperty(value = "状态")
-    private java.lang.String state;
-	/**结单/驳回*/
-	@Excel(name = "结单/驳回", width = 15)
-    @ApiModelProperty(value = "结单/驳回")
-    private java.lang.String cleckState;
-	/**驳回原因*/
-	@Excel(name = "驳回原因", width = 15)
-    @ApiModelProperty(value = "驳回原因")
-    private java.lang.String returnValue;
-	/**结单结果*/
-	@Excel(name = "结单结果", width = 15)
-    @ApiModelProperty(value = "结单结果")
-    private java.lang.String successTitle;
-	/**结单金额*/
-	@Excel(name = "结单金额", width = 15)
-    @ApiModelProperty(value = "结单金额")
-    private java.math.BigDecimal successPrice;
-	/**处理说明*/
-	@Excel(name = "处理说明", width = 15)
-    @ApiModelProperty(value = "处理说明")
-    private java.lang.String sucessText;
-	/**照片*/
-	@Excel(name = "照片", width = 15)
-    @ApiModelProperty(value = "照片")
-    private java.lang.String successImage;
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/mapper/ShcoolSubMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/mapper/ShcoolSubMapper.java
deleted file mode 100644
index c6b0a82..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/mapper/ShcoolSubMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.jeecg.modules.shcoolSub.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.shcoolSub.entity.ShcoolSub;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 报修表
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-public interface ShcoolSubMapper extends BaseMapper<ShcoolSub> {
-
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/mapper/xml/ShcoolSubMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/mapper/xml/ShcoolSubMapper.xml
deleted file mode 100644
index a05ada2..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/mapper/xml/ShcoolSubMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.shcoolSub.mapper.ShcoolSubMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/service/IShcoolSubService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/service/IShcoolSubService.java
deleted file mode 100644
index 6e124e1..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/service/IShcoolSubService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.jeecg.modules.shcoolSub.service;
-
-import org.jeecg.modules.shcoolSub.entity.ShcoolSub;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 报修表
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-public interface IShcoolSubService extends IService<ShcoolSub> {
-
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/service/impl/ShcoolSubServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/service/impl/ShcoolSubServiceImpl.java
deleted file mode 100644
index ab90074..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/service/impl/ShcoolSubServiceImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.jeecg.modules.shcoolSub.service.impl;
-
-import org.jeecg.modules.shcoolSub.entity.ShcoolSub;
-import org.jeecg.modules.shcoolSub.mapper.ShcoolSubMapper;
-import org.jeecg.modules.shcoolSub.service.IShcoolSubService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 报修表
- * @Author: jeecg-boot
- * @Date:   2024-08-29
- * @Version: V1.0
- */
-@Service
-public class ShcoolSubServiceImpl extends ServiceImpl<ShcoolSubMapper, ShcoolSub> implements IShcoolSubService {
-
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/ShcoolSubList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/ShcoolSubList.vue
deleted file mode 100644
index 4ac20bb..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/ShcoolSubList.vue
+++ /dev/null
@@ -1,256 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 查询区域-END -->
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <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>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        :scroll="{x:true}"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
-
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-
-    <shcool-sub-modal ref="modalForm" @ok="modalFormOk"></shcool-sub-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import ShcoolSubModal from './modules/ShcoolSubModal'
-
-  export default {
-    name: 'ShcoolSubList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      ShcoolSubModal
-    },
-    data () {
-      return {
-        description: '报修表管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'楼栋',
-            align:"center",
-            dataIndex: 'building'
-          },
-          {
-            title:'室号',
-            align:"center",
-            dataIndex: 'room'
-          },
-          {
-            title:'项目',
-            align:"center",
-            dataIndex: 'project'
-          },
-          {
-            title:'姓名',
-            align:"center",
-            dataIndex: 'name'
-          },
-          {
-            title:'简介',
-            align:"center",
-            dataIndex: 'context'
-          },
-          {
-            title:'电话',
-            align:"center",
-            dataIndex: 'phone'
-          },
-          {
-            title:'照片',
-            align:"center",
-            dataIndex: 'image',
-            scopedSlots: {customRender: 'imgSlot'}
-          },
-          {
-            title:'用户标识',
-            align:"center",
-            dataIndex: 'userId'
-          },
-          {
-            title:'状态',
-            align:"center",
-            dataIndex: 'state'
-          },
-          {
-            title:'结单/驳回',
-            align:"center",
-            dataIndex: 'cleckState'
-          },
-          {
-            title:'驳回原因',
-            align:"center",
-            dataIndex: 'returnValue'
-          },
-          {
-            title:'结单结果',
-            align:"center",
-            dataIndex: 'successTitle'
-          },
-          {
-            title:'结单金额',
-            align:"center",
-            dataIndex: 'successPrice'
-          },
-          {
-            title:'处理说明',
-            align:"center",
-            dataIndex: 'sucessText'
-          },
-          {
-            title:'照片',
-            align:"center",
-            dataIndex: 'successImage'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: "/shcoolSub/shcoolSub/list",
-          delete: "/shcoolSub/shcoolSub/delete",
-          deleteBatch: "/shcoolSub/shcoolSub/deleteBatch",
-          exportXlsUrl: "/shcoolSub/shcoolSub/exportXls",
-          importExcelUrl: "shcoolSub/shcoolSub/importExcel",
-          
-        },
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
-    this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
-    },
-    methods: {
-      initDictConfig(){
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'building',text:'楼栋',dictCode:''})
-        fieldList.push({type:'string',value:'room',text:'室号',dictCode:''})
-        fieldList.push({type:'string',value:'project',text:'项目',dictCode:''})
-        fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''})
-        fieldList.push({type:'string',value:'context',text:'简介',dictCode:''})
-        fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
-        fieldList.push({type:'string',value:'image',text:'照片',dictCode:''})
-        fieldList.push({type:'string',value:'userId',text:'用户标识',dictCode:''})
-        fieldList.push({type:'string',value:'state',text:'状态',dictCode:''})
-        fieldList.push({type:'string',value:'cleckState',text:'结单/驳回',dictCode:''})
-        fieldList.push({type:'string',value:'returnValue',text:'驳回原因',dictCode:''})
-        fieldList.push({type:'string',value:'successTitle',text:'结单结果',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'successPrice',text:'结单金额',dictCode:''})
-        fieldList.push({type:'string',value:'sucessText',text:'处理说明',dictCode:''})
-        fieldList.push({type:'string',value:'successImage',text:'照片',dictCode:''})
-        this.superFieldList = fieldList
-      }
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/modules/ShcoolSubForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/modules/ShcoolSubForm.vue
deleted file mode 100644
index 5831aaa..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/modules/ShcoolSubForm.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<template>
-  <a-spin :spinning="confirmLoading">
-    <j-form-container :disabled="formDisabled">
-      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-        <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="楼栋" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="building">
-              <a-input v-model="model.building" placeholder="请输入楼栋"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="室号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="room">
-              <a-input v-model="model.room" placeholder="请输入室号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="项目" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="project">
-              <a-input v-model="model.project" placeholder="请输入项目"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
-              <a-input v-model="model.name" placeholder="请输入姓名"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="简介" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="context">
-              <a-textarea v-model="model.context" rows="4" placeholder="请输入简介" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
-              <a-input v-model="model.phone" placeholder="请输入电话"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="照片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
-              <j-image-upload isMultiple  v-model="model.image" ></j-image-upload>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <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="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
-              <a-input v-model="model.state" placeholder="请输入状态"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="结单/驳回" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cleckState">
-              <a-input v-model="model.cleckState" placeholder="请输入结单/驳回"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="驳回原因" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="returnValue">
-              <a-input v-model="model.returnValue" placeholder="请输入驳回原因"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="结单结果" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="successTitle">
-              <a-input v-model="model.successTitle" placeholder="请输入结单结果"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="结单金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="successPrice">
-              <a-input-number v-model="model.successPrice" placeholder="请输入结单金额" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="处理说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sucessText">
-              <a-input v-model="model.sucessText" placeholder="请输入处理说明"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="照片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="successImage">
-              <a-input v-model="model.successImage" placeholder="请输入照片"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </j-form-container>
-  </a-spin>
-</template>
-
-<script>
-
-  import { httpAction, getAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
-
-  export default {
-    name: 'ShcoolSubForm',
-    components: {
-    },
-    props: {
-      //表单禁用
-      disabled: {
-        type: Boolean,
-        default: false,
-        required: false
-      }
-    },
-    data () {
-      return {
-        model:{
-         },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        validatorRules: {
-        },
-        url: {
-          add: "/shcoolSub/shcoolSub/add",
-          edit: "/shcoolSub/shcoolSub/edit",
-          queryById: "/shcoolSub/shcoolSub/queryById"
-        }
-      }
-    },
-    computed: {
-      formDisabled(){
-        return this.disabled
-      },
-    },
-    created () {
-       //备份model原始值
-      this.modelDefault = JSON.parse(JSON.stringify(this.model));
-    },
-    methods: {
-      add () {
-        this.edit(this.modelDefault);
-      },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
-      },
-      submitForm () {
-        const that = this;
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
-          }
-         
-        })
-      },
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/modules/ShcoolSubModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/modules/ShcoolSubModal.Style#Drawer.vue
deleted file mode 100644
index 5f63f7f..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/modules/ShcoolSubModal.Style#Drawer.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <shcool-sub-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></shcool-sub-form>
-    <div class="drawer-footer">
-      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
-      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-
-  import ShcoolSubForm from './ShcoolSubForm'
-
-  export default {
-    name: 'ShcoolSubModal',
-    components: {
-      ShcoolSubForm
-    },
-    data () {
-      return {
-        title:"操作",
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        });
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-/** Button按钮间距 */
-  .ant-btn {
-    margin-left: 30px;
-    margin-bottom: 30px;
-    float: right;
-  }
-  .drawer-footer{
-    position: absolute;
-    bottom: -8px;
-    width: 100%;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    left: 0;
-    background: #fff;
-    border-radius: 0 0 2px 2px;
-  }
-</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/modules/ShcoolSubModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/modules/ShcoolSubModal.vue
deleted file mode 100644
index eaf4dab..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/modules/ShcoolSubModal.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <shcool-sub-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></shcool-sub-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import ShcoolSubForm from './ShcoolSubForm'
-  export default {
-    name: 'ShcoolSubModal',
-    components: {
-      ShcoolSubForm
-    },
-    data () {
-      return {
-        title:'',
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/ShcoolSub.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/ShcoolSub.api.ts
deleted file mode 100644
index 744c4ad..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/ShcoolSub.api.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import {defHttp} from '/@/utils/http/axios';
-import {Modal} from 'ant-design-vue';
-
-enum Api {
-  list = '/shcoolSub/shcoolSub/list',
-  save='/shcoolSub/shcoolSub/add',
-  edit='/shcoolSub/shcoolSub/edit',
-  deleteOne = '/shcoolSub/shcoolSub/delete',
-  deleteBatch = '/shcoolSub/shcoolSub/deleteBatch',
-  importExcel = '/shcoolSub/shcoolSub/importExcel',
-  exportXls = '/shcoolSub/shcoolSub/exportXls',
-}
-/**
- * 导出api
- * @param params
- */
-export const getExportUrl = Api.exportXls;
-/**
- * 导入api
- */
-export const getImportUrl = Api.importExcel;
-/**
- * 列表接口
- * @param params
- */
-export const list = (params) =>
-  defHttp.get({url: Api.list, params});
-
-/**
- * 删除单个
- */
-export const deleteOne = (params,handleSuccess) => {
-  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
-    handleSuccess();
-  });
-}
-/**
- * 批量删除
- * @param params
- */
-export const batchDelete = (params, handleSuccess) => {
-  Modal.confirm({
-    title: '确认删除',
-    content: '是否删除选中数据',
-    okText: '确认',
-    cancelText: '取消',
-    onOk: () => {
-      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
-        handleSuccess();
-      });
-    }
-  });
-}
-/**
- * 保存或者更新
- * @param params
- */
-export const saveOrUpdate = (params, isUpdate) => {
-  let url = isUpdate ? Api.edit : Api.save;
-  return defHttp.post({url: url, params});
-}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/ShcoolSub.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/ShcoolSub.data.ts
deleted file mode 100644
index 76c738f..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/ShcoolSub.data.ts
+++ /dev/null
@@ -1,166 +0,0 @@
-import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
-import { rules} from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
-//列表数据
-export const columns: BasicColumn[] = [
-    {
-    title: '楼栋',
-    align:"center",
-    dataIndex: 'building'
-   },
-   {
-    title: '室号',
-    align:"center",
-    dataIndex: 'room'
-   },
-   {
-    title: '项目',
-    align:"center",
-    dataIndex: 'project'
-   },
-   {
-    title: '姓名',
-    align:"center",
-    dataIndex: 'name'
-   },
-   {
-    title: '简介',
-    align:"center",
-    dataIndex: 'context'
-   },
-   {
-    title: '电话',
-    align:"center",
-    dataIndex: 'phone'
-   },
-   {
-    title: '照片',
-    align:"center",
-    dataIndex: 'image',
-    customRender:render.renderAvatar,
-   },
-   {
-    title: '用户标识',
-    align:"center",
-    dataIndex: 'userId'
-   },
-   {
-    title: '状态',
-    align:"center",
-    dataIndex: 'state'
-   },
-   {
-    title: '结单/驳回',
-    align:"center",
-    dataIndex: 'cleckState'
-   },
-   {
-    title: '驳回原因',
-    align:"center",
-    dataIndex: 'returnValue'
-   },
-   {
-    title: '结单结果',
-    align:"center",
-    dataIndex: 'successTitle'
-   },
-   {
-    title: '结单金额',
-    align:"center",
-    dataIndex: 'successPrice'
-   },
-   {
-    title: '处理说明',
-    align:"center",
-    dataIndex: 'sucessText'
-   },
-   {
-    title: '照片',
-    align:"center",
-    dataIndex: 'successImage'
-   },
-];
-//查询数据
-export const searchFormSchema: FormSchema[] = [
-];
-//表单数据
-export const formSchema: FormSchema[] = [
-  {
-    label: '楼栋',
-    field: 'building',
-    component: 'Input',
-  },
-  {
-    label: '室号',
-    field: 'room',
-    component: 'Input',
-  },
-  {
-    label: '项目',
-    field: 'project',
-    component: 'Input',
-  },
-  {
-    label: '姓名',
-    field: 'name',
-    component: 'Input',
-  },
-  {
-    label: '简介',
-    field: 'context',
-    component: 'InputTextArea',//TODO 注意string转换问题
-  },
-  {
-    label: '电话',
-    field: 'phone',
-    component: 'Input',
-  },
-  {
-    label: '照片',
-    field: 'image',
-     component: 'JImageUpload',
-     componentProps:{
-      },
-  },
-  {
-    label: '用户标识',
-    field: 'userId',
-    component: 'Input',
-  },
-  {
-    label: '状态',
-    field: 'state',
-    component: 'Input',
-  },
-  {
-    label: '结单/驳回',
-    field: 'cleckState',
-    component: 'Input',
-  },
-  {
-    label: '驳回原因',
-    field: 'returnValue',
-    component: 'Input',
-  },
-  {
-    label: '结单结果',
-    field: 'successTitle',
-    component: 'Input',
-  },
-  {
-    label: '结单金额',
-    field: 'successPrice',
-    component: 'InputNumber',
-  },
-  {
-    label: '处理说明',
-    field: 'sucessText',
-    component: 'Input',
-  },
-  {
-    label: '照片',
-    field: 'successImage',
-    component: 'Input',
-  },
-];
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/ShcoolSubList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/ShcoolSubList.vue
deleted file mode 100644
index a01f737..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/ShcoolSubList.vue
+++ /dev/null
@@ -1,162 +0,0 @@
-<template>
-  <div>
-    <!--引用表格-->
-   <BasicTable @register="registerTable" :rowSelection="rowSelection">
-     <!--插槽:table标题-->
-      <template #tableTitle>
-          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
-          <a-dropdown v-if="checkedKeys.length > 0">
-              <template #overlay>
-                <a-menu>
-                  <a-menu-item key="1" @click="batchHandleDelete">
-                    <Icon icon="ant-design:delete-outlined"></Icon>
-                    删除
-                  </a-menu-item>
-                </a-menu>
-              </template>
-              <a-button>批量操作
-                <Icon icon="mdi:chevron-down"></Icon>
-              </a-button>
-        </a-dropdown>
-      </template>
-       <!--操作栏-->
-      <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
-      </template>
-      <!--字段回显插槽-->
-      <template #htmlSlot="{text}">
-         <div v-html="text"></div>
-      </template>
-      <template #fileSlot="{text}">
-         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
-      </template>
-    </BasicTable>
-    <!-- 表单区域 -->
-    <ShcoolSubModal @register="registerModal" @success="handleSuccess"></ShcoolSubModal>
-  </div>
-</template>
-
-<script lang="ts" name="shcoolSub-shcoolSub" setup>
-  import {ref, computed, unref} from 'vue';
-  import {BasicTable, useTable, TableAction} from '/@/components/Table';
-  import {useModal} from '/@/components/Modal';
-  import { useListPage } from '/@/hooks/system/useListPage'
-  import ShcoolSubModal from './components/ShcoolSubModal.vue'
-  import {columns, searchFormSchema} from './shcoolSub.data';
-  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './shcoolSub.api';
-  const checkedKeys = ref<Array<string | number>>([]);
-  //注册model
-  const [registerModal, {openModal}] = useModal();
-  //注册table数据
-  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
-      tableProps:{
-           title: '报修表',
-           api: list,
-           columns,
-           canResize:false,
-           formConfig: {
-              labelWidth: 120,
-              schemas: searchFormSchema,
-              autoSubmitOnEnter:true,
-              showAdvancedButton:true,
-              fieldMapToTime: [
-              ],
-            },
-           actionColumn: {
-               width: 120,
-            },
-      },
-       exportConfig: {
-            name:"报修表",
-            url: getExportUrl,
-          },
-          importConfig: {
-            url: getImportUrl
-          },
-  })
-
-  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
-
-   /**
-    * 新增事件
-    */
-  function handleAdd() {
-     openModal(true, {
-       isUpdate: false,
-       showFooter: true,
-     });
-  }
-   /**
-    * 编辑事件
-    */
-  function handleEdit(record: Recordable) {
-     openModal(true, {
-       record,
-       isUpdate: true,
-       showFooter: true,
-     });
-   }
-   /**
-    * 详情
-   */
-  function handleDetail(record: Recordable) {
-     openModal(true, {
-       record,
-       isUpdate: true,
-       showFooter: false,
-     });
-   }
-   /**
-    * 删除事件
-    */
-  async function handleDelete(record) {
-     await deleteOne({id: record.id}, reload);
-   }
-   /**
-    * 批量删除事件
-    */
-  async function batchHandleDelete() {
-     await batchDelete({ids: checkedKeys.value}, reload);
-   }
-   /**
-    * 成功回调
-    */
-  function handleSuccess() {
-      reload();
-   }
-   /**
-      * 操作栏
-      */
-  function getTableAction(record){
-       return [
-         {
-           label: '编辑',
-           onClick: handleEdit.bind(null, record),
-         }
-       ]
-   }
-     /**
-        * 下拉操作栏
-        */
-  function getDropDownAction(record){
-      return [
-           {
-             label: '详情',
-             onClick: handleDetail.bind(null, record),
-           }, {
-             label: '删除',
-             popConfirm: {
-               title: '是否确认删除',
-               confirm: handleDelete.bind(null, record),
-             }
-           }
-      ]
-   }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/components/ShcoolSubModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/components/ShcoolSubModal.vue
deleted file mode 100644
index be54a26..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/components/ShcoolSubModal.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-<template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
-      <BasicForm @register="registerForm"/>
-  </BasicModal>
-</template>
-
-<script lang="ts" setup>
-    import {ref, computed, unref} from 'vue';
-    import {BasicModal, useModalInner} from '/@/components/Modal';
-    import {BasicForm, useForm} from '/@/components/Form/index';
-    import {formSchema} from '../shcoolSub.data';
-    import {saveOrUpdate} from '../shcoolSub.api';
-    // Emits声明
-    const emit = defineEmits(['register','success']);
-    const isUpdate = ref(true);
-    //表单配置
-    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
-        labelWidth: 150,
-        schemas: formSchema,
-        showActionButtonGroup: false,
-    });
-    //表单赋值
-    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
-        //重置表单
-        await resetFields();
-        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
-        isUpdate.value = !!data?.isUpdate;
-        if (unref(isUpdate)) {
-            //表单赋值
-            await setFieldsValue({
-                ...data.record,
-            });
-        }
-        // 隐藏底部时禁用整个表单
-       setProps({ disabled: !data?.showFooter })
-    });
-    //设置标题
-    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
-    //表单提交事件
-    async function handleSubmit(v) {
-        try {
-            let values = await validate();
-            setModalProps({confirmLoading: true});
-            //提交表单
-            await saveOrUpdate(values, isUpdate.value);
-            //关闭弹窗
-            closeModal();
-            //刷新列表
-            emit('success');
-        } finally {
-            setModalProps({confirmLoading: false});
-        }
-    }
-</script>
-
-<style lang="less" scoped>
-
-</style>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/controller/CheerConfController.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/controller/CheerConfController.class
deleted file mode 100644
index 44b93d4bbf97f52e6cdfa54d95ace6577158a0fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/entity/CheerConf.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/entity/CheerConf.class
deleted file mode 100644
index c90c3c791b6c03b6681d4db7457cf79f41514e98..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5669
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
A9{>OV

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/mapper/CheerConfMapper.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/mapper/CheerConfMapper.class
deleted file mode 100644
index f46bc76c45a4fc6fc5fbd7b691da3ce0559356e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 339
zcmb7AIc~!+5FGkaEH^Il4lfX-li|VwQps@P7f|#@p&*I^MH=weQuqORRA5>;3Ks!V
z?CxNX!OVVqzFz=5W0Bw?!8}1KFhA(3l|DEY=!;sOBsH?FXkXT>d{!uHsFc>|qYY%v
zrS!V*n$VN7j>*WbV@F%r^KO9a!n%rTW>t}~$Ix)xd}DUGZC{C7ul<?wpGLOH1k!^I
zPVtLwqJ+oa*%#mHrbyuFFV=4ncb5Xodp816^}p=Q1O!Gg#_@58Xfos}W<yP`LY``i

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/mapper/xml/CheerConfMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/mapper/xml/CheerConfMapper.xml
deleted file mode 100644
index 6e16809..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/mapper/xml/CheerConfMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.cheerConf.mapper.CheerConfMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/service/ICheerConfService.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/service/ICheerConfService.class
deleted file mode 100644
index 4bd9811e3f3f115b118adad63d348f3324f5e7a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 352
zcmbVIyKcfj5S$AH^Jr4#GqMFx8POm`Lb8;?UvNGabC!LF?g8P~DEI(AD#DP2f+9tV
z-5t$pM>Bi=I-USbFiOx*Fi0>I805M%GDOD$`>c{XNwqX3eH0a|kY>s@R7l(Cm5tOK
z3K_KD*3lDx1~y(>L!RAEE2d@s4Q82jB~{F-q{gmd&7RbT*)6PD6PuvJffm0+I!^_L
zxs6WoyRKUsugm-LNAd0IOJMq!?%l=XvB1k?EP?Sqa`glRp4#fPUqp+#xBiUYZ6+7=
C&Tt|C

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/service/impl/CheerConfServiceImpl.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/service/impl/CheerConfServiceImpl.class
deleted file mode 100644
index 7fd77ade272b673cccfa1a7833f3be762a2e7e4e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 793
zcmbtSO-~y!5Pi;P36$_rD)q>X_E2Bow3MofgcK?CK&srG&5$@<+bi1(&ClY5#GyZ+
zzo5US>g+;9OQon%WNGa8JmZ;po*%#NzXLeN>kjJJYh%BSS8W^!v`)3v@l2q8^mZiB
z=(!0AbO+kf=faH1e^KL%nZ1EaRW?#ym-vxv#F-8P9|z7)<(w#;O5-L)MnR@CBHwfN
zN(S=RIwh%1p2^;l9zL*rCKG{;p`Kb53(uK;4pL|2SUIC7u8?LiR#AsMD}tnNk!;Y;
z{{845Z=J3z#i%?d|5U_9g_D&rWTTFYr<mkywg0l+{_|G3&CbvjKBaSAD*EQRL#f64
zxw=+-cUf>+Ln9qD%l*k(7g+^oS?!~$+>m>1r&nGXx^e!i43Rv!xX4L9%8_iLiI%{J
zwLV86S>rndPW~tRKU(1sH6B!+N1j^2i#uW4W+W>NG~eAp+%i$a3%2Dou!{}0Th+OV
X4mKIp8JAu!v0d$5?C@Ut?*hL8mBREA

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/controller/CheerRechargeController.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/controller/CheerRechargeController.class
deleted file mode 100644
index e4dc64f672ba18b2aae8058fa4440f8a9761b3a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/entity/CheerRecharge.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/entity/CheerRecharge.class
deleted file mode 100644
index bd0c9248c08335a33c9b504170a7801d2ff02be2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/mapper/CheerRechargeMapper.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/mapper/CheerRechargeMapper.class
deleted file mode 100644
index eb2632770b56a518220d160157ddcd7c628fca32..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 359
zcmb7AK~4iP44lx?rRCBiufP{hY{h{}oEBB0FYu;Tn$>2r$|gt^KjXjycoZTm8~`Cz
z9BhwlYdquEx91lCS2!<lR$yLWp)lWC({W5e6rQSvADLS23~lO0bSx|F9o6ie-T6fB
zP;<0H-==}I4?>RnUIN|nAon9&RX!MMM6@C2cd3=Uxfcl!qW2t(kaW?;1FgR|%bQYR
zvGplvxwCDSa`9vS$$j~uPT~64g)dQmFeog4J5<O{{$+8dpm367lAno;rei+EY^=pQ
DaQJej

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/mapper/xml/CheerRechargeMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/mapper/xml/CheerRechargeMapper.xml
deleted file mode 100644
index e025af8..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/mapper/xml/CheerRechargeMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.cheerRecharge.mapper.CheerRechargeMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/service/ICheerRechargeService.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/service/ICheerRechargeService.class
deleted file mode 100644
index dafbcedc585be065a352105e3b62ac45ce8a42ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 372
zcmbVIOG*Pl5PfYvlf;c{4`D5IHzu2a5Eu|LC+O)EogQYor9Z)}yjK=EfQOQdQN)N4
z$fBwqMe#oM{;}Hwc))drQHF7biNLrt+RB(b3%nJz+(>Gq)%0A|tYTg$*HR^2YgR5%
zyRBq2;iXA|_%*T(##svNH%2in$}jL(IIpQ@R+?J3N(~26Yi7S>wU%Bpv5h8fY5see
z&vJoD>5^CcWSY*-?c(I%oBi(7qrmi>#*eH2NCa;FMiscfAnQ;-;Hs-$_gQqPf9wMc
Hk25;}kR^CM

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/service/impl/CheerRechargeServiceImpl.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/service/impl/CheerRechargeServiceImpl.class
deleted file mode 100644
index 1187722457f8d5e49e1c34dcafd52b4ce04ea42e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 845
zcmb_a%}yIJ5dKUEfk4YoDG~<`+<-%U;kJN;5Ur3x4+Q1zY=({L+FsdSAdkffi9;Wt
zPs0<S&Tgqhq)0&mSsMGBKhJzKf1V$I1K7t#8x5?r@TG<I7QPD19cZiLkw9Z-w<j=r
z;szwJ+|ibPmZnesQuTAztaV(f@}Ba#!Y|6%IMhMlN5}b0UK6F6G;UDl6l6Li@)wj2
zmCr~9@;5pqsZEi~lh>y1Kg$^#5`l%T&a8^1=O3RssWY;#oY4bUN;B%Ks6&yLLDF3$
z8?>|IiC^V9m|BuiML~YNnDbhfOpPTQbsUYyCP&lb{?l+ai2`oF-F2l;>AS8N-<sr9
z@$~Il-6(<0i;~MQ)YC!pNRF*_kr{H9C$dww5DKqtcIB0!Tjzht5XqB^qk`lMRml>X
zm=ietkO2xL?--fD;ajVi$RD;b!^_P(%$qLwaAz!AjAV_0=H3IuJu7A~&$2QDt5{&U
aRKJ^OW06sVapm<1pX+-WD|}b}tH59QWC=6?

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/controller/CheerWaterController.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/controller/CheerWaterController.class
deleted file mode 100644
index bceeed56604c47743cc3b21d19d6cc85ba423d4d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/entity/CheerWater.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/entity/CheerWater.class
deleted file mode 100644
index 18f51ace169ba8b5a580524275c53e2f2bd25f5e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/mapper/CheerWaterMapper.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/mapper/CheerWaterMapper.class
deleted file mode 100644
index bfa275ecb3d2674dd9ee4a32bde9426603d23112..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 344
zcmb7Au};H441EW*q3zOz-@r?^AO?__QZaPs>|Ct$qFgSz+#&VX82SPIsH#VbK<a?R
zVEf5_etP!t^mzcV!Xm?chFONW!fa#ejzjdK5Q~OCm|E^?dM_K%AuqJERI;<Ca*^!5
z<Y0!rjRR@tg)H~IczWSM)+2l>oUf@7(KT6D#a0q?C*rpp5>dKf!k%7#I{9<1FyFZ7
zwY-@&nRxgeUL+sCOew7X6#h1Hy{oXiK1m^2|JO}Z1%;awx9NLG=x)ptOvjp?0S2sX
A0RR91

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/mapper/xml/CheerWaterMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/mapper/xml/CheerWaterMapper.xml
deleted file mode 100644
index 0656457..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/mapper/xml/CheerWaterMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.cheerWater.mapper.CheerWaterMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/service/ICheerWaterService.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/service/ICheerWaterService.class
deleted file mode 100644
index fae8fac64ffd939ae510ccc4dabe3b43a6793316..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 357
zcmbVIyK2Kg5S)u2@}qI*zsMFbxKMCo2p9w@RJcB!7v+R>7w%!KUrXT+@JE>_PH-Rr
z7cO>pm}Q5VJ)J*}02Y`g7$q1dm<Wt>T^bppV}UlS<X%!OO-Zjs#VVwkvJDl|HhO0x
zHEkh-_V0D{#D~DfYir1}+iS(N$-lvKW?e}Yvnr{vyI8X)^~UVBGO!~yL5G&sS0-Jh
z0+ZZEr}#zJoss$Gcl#sy_+?FCc~ko8<lni#>~A)Kr#r$81q2?t>UFO~hx(U3!0<AY
EPuFE~m;e9(

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/service/impl/CheerWaterServiceImpl.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/service/impl/CheerWaterServiceImpl.class
deleted file mode 100644
index 486996638c8476d3e4c376879b10c0fa5de7b363..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 806
zcmbtS!A=`75Pc?ukd!ur0usG(qdn9YBo0AA2&ocM+CziF+1U)ibZxI}FObjTgv6mA
z(2w9#5VPBafRF$QSsHtuXZ&WK=ilAUUjW-!Z=iye8a~&sTEm*a!mhSDb_6P0U;6^{
z2X06L&91ieD>no3M{1BVveI>lO8d&|!k>Wi@l*$a{jT#Pc}A3sq;bPMr67}2B7dwR
zc^Sx`>x85>St<`6@ZNv;kkPh4y{AW3#oRO3Z8vd74wN%`=yGYs0~K}1(mY7IjAVm$
z_UWsS-r9Y+7^AX`Ynqkuvjo~NXOWFMjvr;UJFjF+n?9T|O^W1Z8$Fl%gnsBk*)Pu`
z3Q4}7sdFW;@jGW~Lwy}I>%MQTi!6q-Ec;ejbI825qZ6+TT{!<o29}&$9A_k_giEMm
zL16Elza-Fp$G-^dyovw0VA#YQPc088kFemy-LS2(Crclwe!GUaVqgx7Y>R84g*w}%
a@?1p&AK0s~UqpSxr*dy%nfD^T1>6Ig>iT#9

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/controller/PayOrderController.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/controller/PayOrderController.class
deleted file mode 100644
index eef42e5491dab3f2f5d403a58b1533599e5769c8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/entity/PayOrder.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/entity/PayOrder.class
deleted file mode 100644
index 4dc865d9a1b2b679363d55b87d9d06bc5915fd04..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/mapper/PayOrderMapper.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/mapper/PayOrderMapper.class
deleted file mode 100644
index c6477c1f464771d98677e33e5d34cb86a553dff1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 334
zcmb7AK~BR!44kE<q2+?aKX4D+QuV;0r=TMB1<uBbHp*tx%`Q^D#(@X$DAa8z2RI;c
zusxRT(TqPn-`)W{;x@xghGmA8!t!A1jzjdKa4Z^rWoo&rX<s&?LtbcSsbptO<s#X!
z<Y0!rjRR@tg)H~IczWVNo+r2|oUf@7(KT6D#a0IDdEEOdtw|S580qEG=i6Lib#T#Z
y*_k#8xc?q~kv*K{D6IdWya@Ptr*QY%h(Z$lFDDBHg{u^^^fM$hpYk;pQ_W5_J!vBV

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/mapper/xml/PayOrderMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/mapper/xml/PayOrderMapper.xml
deleted file mode 100644
index 7b0a219..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/mapper/xml/PayOrderMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.payOrder.mapper.PayOrderMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/service/IPayOrderService.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/service/IPayOrderService.class
deleted file mode 100644
index 8e4a9061819b7cb9bdcccffd07fcdc941be6adb5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 347
zcmbVIIS#@=4D@n^qoLs&xPUH*5(z01NO{3#V?`S!yU`wqe2sz!@F>J`78Dc|wr6B{
zG~>(lbOwMWOd=RYFp6NzV3f*2apw&&@JY!J94oF0++`&R7bim3m~mapTzjnBj5}$Y
z%3GwPBW0ylXvrL;Al#-;uu8Nkup|-%);jkUS!{T_GdUR~<)mwI|KjmFW-v~*H-a{@
w3MOXT_wFS(znfyP_#ygn@O8>y`kg2U{Sj%vfI%lzH#`sm>OFcN29Fut0MO`ex&QzG

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/service/impl/PayOrderServiceImpl.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/service/impl/PayOrderServiceImpl.class
deleted file mode 100644
index af3fec9ebd26486ca2ff62482ea90dd2170705cd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 780
zcmbtSO-~y!5Pc?uK*~o$0nsD3&;vfuTOd+}R0%1CilE%RyF+SN+bi2ko1ew0QV;zB
z9Qi?2XSYdJI7F2qOJl$18PA*XJpTIe6To}ywb8(K3vXK3X<=7j<wRQ@`vQ&b;YeWl
z%w;67HPDtWN|TVkR!Ppx_Q0hoA1SXZJSCUo7aasn2hNY>Em1m_#${zrK^AIq=`->&
zkiXX{No|T;ex9<!Kjb-cJ%P2M9$OVl&v~8(sWUQB&gjgQ(o7N+btv*ONctAZ2JP(g
zH~)F-WS$VCih}jbBz&r2Z(ao1sN>{sM6W;BdsgWAEW=b77uX)U(x>!MSDoB{abGpz
z=vLh;fwxyBr!+LuL35WsSnDE}?<_aDTPqEP*LHm4m7%ZB-^mcklZ%sr<SgAfnphF&
zE$}BCy}&OB9REk|mu<oUmUuRK1bI*eFRp@Zi;=7`(0unD;(>`Jtg@}HfezN#uGi-#
X+IYpN!MO6;z-GN~;Wh7-e+T#tGb8Y7

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/controller/PayShopController.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/controller/PayShopController.class
deleted file mode 100644
index b35e5e617069d826edf729e684d6c5a91066318e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/entity/PayShop.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/entity/PayShop.class
deleted file mode 100644
index bfcc025dbc06355389b4cce3d280146ca99aa474..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8869
zcmd5>d3;pW6+Sna<;|8%0ttD9u#`{;AxyPu^&ys38k=A=fZ~Qj@=OLNGjV33qTOuW
zty=|Av2Ind6%j3atV>(9wR^R-)oRry0lL}R)s=qd-TP)HGfx@*YktXn-#zC$=e~RH
zx#!-QJomw#$BF0&5%kkh^t_J_rx&>S6*s@;=0$FP!_9BGd5N2sx%nM8uW<7!H^1lR
zHEv$_(i?sX)AJhrfuBQu2!}Nq;pbkB_VIH+YyPOwpSbg9jsC*VziRX*KmVrD-}(8L
zM*raFKQ;OnKmV=KfB5-djo#+xI~u*q&-XNXpPwISbO295nh@|W%DkeS`z}mQxViCo
zh1V-ILE*HSibdlq%v3s-Oe}9*BuJbfD6}w{NN1vn%!+7yz;q)t{38UF#kvJmx2=hu
zAC1JLiJnMjCKXHc%n_uYJdnu5`pgxvbZm9poS#S}Gtms3rUkXMbtU^EtE0)jSa)(D
z(zkXsH0l2MKspl5@*>NkuxssxFIQ%5zbR-|NoK9x%fN<}Z+>TI>yo9bcoI!*v1BBD
zLA0mGOy!M{j?C|mwI{pHct<MPZ>BP9Vdp-dCn?A?v}<txx-AG>SIUfL%mr)VbNI@Q
z!-IQ<_UsYlm*QoZBmyU6Fp!DGBa1+WpP=N9Y`Aaa_B-KapugMpGO}^o$jw`&7b%ur
zf>L3dxMO|M9ypJ*B~v|-HKy6sb51JSXI_v@og3*-#v<m0U1mIQK9R*N;D{wa!xV-$
zKEC&=D=?=EV%?cu&%D`c<;b0hW#Y^jx$BDk_uPV+S%PKeg&8)x{IcOKyLpQ7XgX~z
zI;4B|Y#P4uK|$q-fj&%c-?oQ_cJm}g)^EiK{i#?N9M;M}^hGnhkp;1yMP?T!!LQ^Q
z8r(T@*JB7oGTz-G$)4fs?u1y7w=0>*m<fy>+_(MGkv%sI4PLW%@LG<2GNHz=mYU%$
zckI9QGW!iZ$Ho$|%yD?B8BHrN?}b=QL6vQ>gt>H}Z?&1SvWRmu*@e80BD;}QO6bb;
z#*mIPbK#BjCA$aWW;)UzUEA54?2q7`Vwts(4%y}G=rJ>`Ncyoenw-);0QJIbx`eVl
zxxUr5QGTAV$?|M&u!-zR6Ak@VnFb7($z==LP%fA?PX1Csjp-wN04mmX_SnTs!*6h6
zc2WH3VZY1eu;!Cp0(V+Y{<s;%b8kA7D2Ch3OmDKgBg*NVLA4PSfbYD>WqUFV$Ep!?
zfjgw}*m+)zvpp4K^z9e}+A+4FiZQwi^J9#@j4^<U@dEXhg&{uVcg<T39yYrgvZFSH
zmPyKTi_K-8HxP{@iZ%HwbK>eXW>;oT(`l&U$<cLMsgTdfOs|>34&=Si$mLwKBo+)=
z!d&^QkgA-ZGLIl*8P2Cjk@O<#92ZgLB`1(xWPg;Ge34(ipxg=pIf|-}Qe_n|<dIaV
zUWH|4b>uQu=BbrL&LMAU?K$L$G>c>vKA-epVL7rYeQIRYle5m%IyLK@ASlPR*ES^G
zW(%Q;eRl8JvCj%ZotbFYx$V(@tD50V$05!IGn!b;$pF|JP4~)zi0asiweC2%wS6&?
z0oao=(*to7+;VHBeT}(A4Ja&^!q=EvsDQ#!<7rg!_cW?#`z4TZg`2zpx*Dy3c^XxC
ze2uwCXpPxf<2|wy^mir)QeEcpF+Qk*sszvGy9OVLC0`+yqQszZYbfcf(x~ZzrX1`x
z0D6T@AAWfEzDMpxUUi%4u2ig_?=aYBLxZ>M+qQdn{pG_qT{85<mXUS4_uc(Kka{T=
zq`7olkd|=MN+$%VjnPs@9gI%lW+gYLb8{v)tLW??t>&hiyXO#2v~h*Ess#hFcsK9W
zfQrS8SohqZ@CkpAl7x8$W=*zNac+>#V^PQ!@sdH9qBL6sEV8|@kY^M*x8oojAXF4>
z)?{m$(LbL_=v%9e{sr6*sy;6|WEa|_X4f9VwJh|^nv4`c?;_>K$^`T;rq5ZgV<!Ye
zpJ$OD?=E)-Bwt`7o}fw(h`z`o(G;YwF_@9PBOT-r57JIr7o?lG*+sbJgmZzGWf7;l
zCBmJt)4C7GF5+7QrV#D#HxsClE%{|u-Fb`e18TvLO{4gBSuQ$5Z9YxGt^Ftx^eL*O
z@pLpD18m^xRz`F1hx9`K)9BZtHxGEeNegHpEdpGersE++_9;#PPo?+_6v)V8#b=>F
zmKH18p+M#qD^7$0*{l>gdMDxU<TQ2CvPHDq9<dWb<a;sg)KRokLBozHrkys5b{c5d
zGsUzsM$ygy4ZEtCcGf7`S)gIx71N@lXi?CxGmB|mqi9{AVeb~x%uzHGH0<tTTF)q2
z4^lvIF+sZq3mw5z;OU;Zlf)xdCY+1bV+qGo95^Tm)JF;Q1Xl#Kqm8#w+13K%X^zII
z9S+9jg~l@+jZtG9j9rDs&5p(>L=ML8LgU$v#wb`0#-2js!yJuK-5iX)g~mrZ8lx0C
z7;A;b$2c0JW;z)A3XSJF8l$#482by2=Q|ps6gwCP3XK;#8l!GI7zYcDTOEy2;T?=a
zg~siU#yAWdj4KL_PjWQIvEg7`S!lf6(fCVr33f2=Dz3z3czS0xZ>O@Eh30Zoa)Aa#
zZAwP6cz+pEw?HS1SNV#w&+?Le%3`m4F0p)GN|!mkr>kV2@|;jUTP>fLJHMy9WS{bg
zQ9j!&pI11)r>A6}@^n%@ms&orbbe27$v)-5rhIl-KCg22sg>+go`TBfDVEQxoqhUB
z_9>4{<#VOw^BQNL{*ryl^Hupg-SYWWXP<$ReagdF`8?C|c`aS%l%K(peae$t`CMiB
zyx!SosAQk=m{&emTRv}ao_j^fKINT2`RulQ-stSJvSgp~0-=1KWBJ4tSQWK55Ldn`
z>>8x-%AHhIUA=?G%-lg^@u;qmxR&uaiR*TdUOisodX`U+xPj#pC7#6c$r4Xt{4t5A
zGH#T38sm>kJe~0jiJRCD#^-lvW;{#c7Us;BIKuc7Xm-$H&V^LoZgypFH@Lma{Bbqn
zISE(e#^#y#liRhq`6)X5HgcD5Zhn#uZ=Z!xKWTM21WPgYSi{xwECqDeGgP&Sf-Smh
z2OVKEY7I9iwT4G`Gsp7`Rd1q@?$$kdq&mY3Qk|jcUM6XZ<khu2QoZ2=sowDGJ|_7U
z$*24CNDW2+qy{6X2bdI8B%nOfBqIdUB%?wPF{wh4LV86WX^K$^(i9`CS28KANR@gx
zk2KY&0%@vItyeLrT9K-Bq)0Xd(~L17O*6*oW0*8nk;dpqpe$*+Q3KL+qgJnBQmrD@
z=*X-rsmT}zQj<}qk7H7uB8}6La#>Qdp@Y<HjMsH0jaMXHM@nW%Ek->^Eye`Bo=FoF
zsa{8}W=RpF0i=jAQEy<<L`7=Qk;IbZ+KhcsPPv<N1E2BYXqi9uAzju;>*;3fp_;Nv
z+JM`188wy>-2z!T%@ps@tw1hXB3_}}fZWtBUZjmc9*T=ybUTojQsPniI*>*;iks*T
zARlcI*V3Ipe%c`tbQe&79uvKEH&BpX7Oiv-P>5a^3+Wp`6}a;^(!D^H!XqZqeL!I`
zjSkTLKvkld-lk1J)#3zti5>tNBRc2>`X<m=k)-YPEub1PKo8S{K(%5W-9Vdx#);eL
zYI+E$PV7cJwgBnk2{OUFnZ}D(@fmU}P`wzUdGrX-gtBscBzY95q0C41^lhMtv<>mR
zms-5qdsN}2?e9~qmv-P+6Yo=<gued^NUB(_N3nGA=YLr|tPj>$TXJ*N;Or<X%ns`_
zHVAfh0BykBh3#>JRete3f-JwDd2msMr20a5&atk!R?(Rdp3{qxqlKF{kr!p}$g^2q
zYq(gUyOc)bLL^mnhTBr123ba$?zUC+hR0HQvMN+2Y1LqOEftEAvhv!hNrq;rw5$rH
zN?J`Ze3lATN?G}A)l|c8sr*?LYL~Q{W&|u1%9gSU*sAG9&{74ns-UfEGD4OLbxc`>
zY*n*SVW}#zDpWT)R*O+-sZiLIRi&+p7-35l&Z<!EU^T&Uqa*dLl~GGsE-t1$G>CO`
zi?#F^P#O6}hQ5R4EvKpCbb1`fg|Fh~(Gx&!T8Yi~B#?(P_($qfKwi3@-lXpWY1nKp
z(D#6R^fa>J`#^qr4O{<dpa8v#YyLApK~am(_0Ix@#9`D<KLDx_ZTQ0Hhd`C0hsM!!
zKw;io<!{l10}!~dxrD%m!v9<k;N^1tG8WX3+a}l?*JzQVdGcsEW}#G(y`#xFzJo%U
zXhkMDD`%ZD^f?*kY(G@3%>5r?p7Zcg4CN&7;ZAaX4nk6{f*<KB=k4G;<uG(GhdG}m
zQI%UR+E!k{{3Cv?taDi<z7)1{URj#++?yYQff^!Q@({UE4$VdlRCOo=<;FT>GYp3+
i^dsva`myyDFMqZA6VxbtulrN_89D$zr(dM$m;VDWI7X5H

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/mapper/PayShopMapper.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/mapper/PayShopMapper.class
deleted file mode 100644
index 51f11bbb3e0cfcf136390aeedba7a39f5040c176..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 329
zcmb7Av2MaZ4D~@Fg)XQcf)}<_3>`Y9qEf!VIjnF|E<RoED&^N0_<(*C>NT){)PceF
zvn)Tq=b!WO1OOX&$>2GIMFvX+i_+8`h3Hv<6b*e7w$#<Qs~XlJFSJ;!NUYgQL_1Uz
zOz+y*qZZF-$vO7;PCb8)@U0MEW5cX#w6c#a_vmOS58{x!V8Vc3mp0$#3YMiruld8Y
w>HO<;a$#EkX;HBLpYMA7W=p~9-h+aq^&t~;1qvo9rs-Xf(9@V_Fdu973)(PeGynhq

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/mapper/xml/PayShopMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/mapper/xml/PayShopMapper.xml
deleted file mode 100644
index c122179..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/mapper/xml/PayShopMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.payShop.mapper.PayShopMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/service/IPayShopService.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/service/IPayShopService.class
deleted file mode 100644
index 37927ef84365fe6fc6540f457e4c72484a63a3e9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 342
zcmbVIO>4qH5PfT{@#E4%e}{wUEv3hT5NIL4V6z$GhGaKncg6fQ5B>muRB5UrD0uNO
zGjAB?&3kkF-5&s~FpDsbFo`e~n54Qe(ubA>TvE!dq)M8CzO#~*j}v8U%A~DzZUfa_
zCcSn|6&&%-vvJxQa@=mUVp^wX@R8WIppsb?RNFjM?5L4ly0Hzh@!EIvb8h3$SYVpk
z&?^4YRWIRveHmT2=KqQW7LOUP*KZdE-tNr^ET3>Q5)c^l@zVbeJsO_!D@Lap{Q+BJ
BY|8)u

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/service/impl/PayShopServiceImpl.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/service/impl/PayShopServiceImpl.class
deleted file mode 100644
index c9b8bbd73216d11c6c320de26bd58a086e62bdda..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 767
zcmbtSO=}x55Pgcj630zy_lq8Tb9;yg^itLsN}v$fmQokrwd<*)bR{j4HjRH)PK6%&
z14@5W$m}MDItLe81S7qtK{M}ZeqI0g3E(xJ_R+$qhetg;?%|0*ccQJ1Q-Rj_<y@eB
z;ua)um}*NODwC1_tg?ccQR;G4%$3(Qz9ZZ5Ob3A^b$%(&iSng1Zc!B!WT{rOGgrz$
z{zB&@wJ8hv@s^z3a;Hos0(&#Pv?^AftNc!LXJn?F(F<2ev&vM|p)9H(=`xZH+S$z~
z|9ES%r46IXlKi@X_YK<CHrc4-YMq}<x8<%So^HxxY5ke2d`|Cl?clS`>stNMxw=pS
z&p%aM&d^*3&E~$f)<xFsEPFd{M1|68yZqvnp>NKAl_8QR7gr_8I|GsdI_L_#`RA|T
zfBX;g1&;q-`JO{~fgK)4o;sdQ!HX4e>@kuJ20E|4LtHVjgI$jGH88{;$3b)MppSh<
TEyi`$0~|E_As+Hx=MRA!-%jge

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/controller/ShcoolFloorController.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/controller/ShcoolFloorController.class
deleted file mode 100644
index 6f213c3b97ce05b528c0ceb7eda80f4c2305918c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10162
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
E4-+-dwEzGB

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/entity/ShcoolFloor.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/entity/ShcoolFloor.class
deleted file mode 100644
index 33d705c0a32bef67918b29ed339e01297f5796f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6151
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
a|1RX;V?V&Y@ni5gdL9#i7wANRe)vD3P1%P4

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/mapper/ShcoolFloorMapper.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/mapper/ShcoolFloorMapper.class
deleted file mode 100644
index e29be24dda84403175e494190b5733ef2f336853..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 584
zcmb7BOHaZ;5S~S#fG>PR?<PjQxEJH4#zYUCK#eurx9y}X*>;<KVEAhu`~m(b<FpVU
zF&;cj=CR*5`_0VP_s1sy+`v%){QwREIAn0_%TzdgGl)+*#mEWgErW~8;Z)27SE9&x
z<cut`@OR~E%%DF)H__>fFd|2XhR6+>GHBantFu>MIGN*ES{W-`0UwG&6GZBQDCa|M
zGA>GyOpwc%%9e{YfY+>$L2D+IM+V(UW(7$#6u)l>dyc1=xNw;0oX0}vGS!~v^SWWF
zyyb~D$a7JaX!xVBII6?D`uizjlJQ)pUZLf7l4z|4N^8TBCUA2etxMrOsp&=9n*;|^
zk&Kg#*G1RsYK07LtI_`My%h6{O{-m>U@;d1(*Li)+6?F(WLtE3)@0Cx7UgZqx(x`(
cb*hl;v_kdBwk_3HVTaH=^xS}5*sJ~i4=xz5(*OVf

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/mapper/xml/ShcoolFloorMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/mapper/xml/ShcoolFloorMapper.xml
deleted file mode 100644
index 1d46344..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/mapper/xml/ShcoolFloorMapper.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.shcoolFloor.mapper.ShcoolFloorMapper">
-
-	<update id="updateTreeNodeStatus" parameterType="java.lang.String">
-		update shcool_floor set has_child = #{status} where id = #{id}
-	</update>
-
-</mapper>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/service/IShcoolFloorService.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/service/IShcoolFloorService.class
deleted file mode 100644
index d379bf0d96380e14724c3bd0a644c3c668a937a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1147
zcmbtT+iuf95S<Naou)1HLZRh;c}X8&LBIn_h19DWWa@xRc&s+|$lb{Hn)SMB#D^jA
zzz6iB5Mw7`S0zXkS!>PhoSB`SIs5VLI{>_d#}?eR;GPBd8C?C~IEP2w&dyP9)Bd>2
zV96ec6Tw3f2i!GU#zC9G{I-fyBVyANVTKKOz@V|e>2B|L?41TYWMCaQg+heF_uXSp
zsc<h;N;7!XvXu__0MQG0r2H(zl&56`$Jj_S<P}hRy~kkT9hzh1cZC)a8q_I+*$Rxo
zVwU*AU<JpZxqIqiVkDJo!6S<CF(mN0n3dMWE9MDn(r2*zIYT`>)QGlB&4KEQ02w$f
z+fxzm3l&LUWjq@8g^_6zW-0fSM*79REYk9VfWOaaK53C8sN3tKgqe{c&uOWnb4A!V
zfWeF_gIJhMQ?jrBm2BhRyZz=uftMm-@TJmNr$0c?v?uosPYuQ?y%bMTpGXgR#~lfm
z%-(cWrajz~AvJNeQ+e|-@6&v;8NB}cIF{9vGdd=qp)8kUbU_9$CQioW8!}+e=saie
zq%4MbBI*YInqdAmUzshX%<rL|CJ@x<T%m6b>M%v}G%a-vEYceleTMXAMYo_{rwxKR
zLd+9lidGeXOxMU%g9S3x$+dXixdh99a$YZxD{zCHW3rn>uv%2IM#hnJ3vL&dJ3j$g
C{!mf?

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/service/impl/ShcoolFloorServiceImpl.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/service/impl/ShcoolFloorServiceImpl.class
deleted file mode 100644
index e9b38934b81117c14e97248bb53c6626f23d1150..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5191
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
YG6UI&qZZx1kMS(t<>=HT_2Ve;e_@qzQ2+n{

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/controller/ShcoolSubController.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/controller/ShcoolSubController.class
deleted file mode 100644
index d238bf8fe22698f35722550ea1f58e57873f381d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/entity/ShcoolSub.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/entity/ShcoolSub.class
deleted file mode 100644
index bc4ec24af68321d9f6066b6584443a64356d200d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12330
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
bxBd_Szko+U<lp`aUHDP<VFW})N(BEG*1@Qo

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/mapper/ShcoolSubMapper.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/mapper/ShcoolSubMapper.class
deleted file mode 100644
index 5e6f286f0bda621991ec23abec33e3035974f1fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 339
zcmb7=Jx&8b429o7$db@da1JaXx<wQesTNV}31%nOW>z!n)%+mkYAJF64uu$&pCSbk
zh3zL>e){aU_rnpuJ+3NTR#;V7E38`Ek2>YR3b7gVt0t$%o?g0vO{yCso;oewZY7i7
zcRJZPxg5zzVDfsJIM9=h{5;EtMnX>mv+2ppHam_KcSgjuxg#EvO?zs88ueqXux=#>
z!yD@g!p-mO%kTD+Na5};*KdfEO@-^zYZMCgzs^}ID4dlzFONe}i#cClIoIj~yGCn7

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/mapper/xml/ShcoolSubMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/mapper/xml/ShcoolSubMapper.xml
deleted file mode 100644
index a05ada2..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/mapper/xml/ShcoolSubMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.shcoolSub.mapper.ShcoolSubMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/service/IShcoolSubService.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/service/IShcoolSubService.class
deleted file mode 100644
index 926503af222c86b045054d0df87c3229a5b2e9f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 352
zcmbVIyG{c!5FGQ!k))yGGuQ&C4pAaSIw^&}z~`(EpL||)wgdS!ihMvmD#{TOBBh|9
z*xk{rb~Lk_?bjN>Bc=sz3XBU(6vo;$!KB=?!bjDbr6F%ZL-V?2o65>cN41g8EhJO7
zs!ek7-RDUBnK(ozfg<-yXPIXD2Rv8OH`FrQhB{ef&ynJr74bUP#38w~B7G#vmr`M(
zCHIzJogZx6&3=~$#rtnx3QvFOo?IN25623(=dlzX{*h~>pl~tN<?uxe=xX1uG1|{!
E2Xg~(+W-In

diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/service/impl/ShcoolSubServiceImpl.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/service/impl/ShcoolSubServiceImpl.class
deleted file mode 100644
index ec5f0ca480c7538c7801ab9777f976fa329eff6a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 793
zcmbtSO-m#(5PfkRN5`-A6FhoT59Xq$c3ngegmDkH%st&xj?qriBx&9GS$kU8!~Ot&
z!Ty@X>Q)&TVOWqrCGVvwRrONO|9<}gaD?qHT3GL3ql3*3wgl!*wAJxcptZN(7nnVF
z0}@#6X-nTLlaaqsS;5SD&*iG<E3a$(M$X1N9R$AhoFB@2qI@Wg8&m}a8SZlDinPjP
zApfXylG>DoOyBABmAzy#5m-p|(5hH@&h)pJJ0mmYj2^g3no*{r4rNgVNk1alpq-s~
zbo|!I)KZKpOY-9)t{R+7jUgL#9F1d=)9L>2?Osl{%58R2SNWVSbgk&lq(iO6;k|lP
ze0N=OT0?yuG|PQvt&6OJv#j=BQ*J1|w!>Sm3_UsjAVVZiE{;l)Z_*}9Xk$*`>!&_P
zAo;|12ps=U_77TN7c)GlJdZrJf){tfw!=s^7-%2-g80eA4CdL^*T5PU*e*5aHo913
U)M8wFEn}tGSMi1S+J6mr0h@dE^8f$<

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 8919ebd5183c1ca6e1ce9a390a73417672ca5a02..b8c56ae4146d3ea4d423448f1e2c02b665d4feb8 100644
GIT binary patch
delta 42193
zcmZsCcOcc@|G&FjJA3a<HW}G_?=8EC5ZNR*Tq9)NbR|S(?|CI#_Kc*mx5!FG5x+Zn
zkI(z}{p)q^bDih&ah~V-I_JF3tvX@toMt06(FcKv@bC!m@ObsO(@D8On1@sqhztE#
zX9Mx*aU-Ar9t;&>3SvPR10nybf^Y<gV!3GmDeQ9;ij_hnMG*c+@&X`+l|W(bP-ENU
z5Ef)LHI#z*UtS<6M41qVKoSIb6Ul!}<cnZ91PHPD|GHs{))57<VU3!Cgs{*1Ae>7m
zkT~{tl@Jp$j}$<Hbb<hg5iDRLEL9LJ_rKixvH;@$^oz0H3C39;q5NaT*%eCuFF6cU
zqfk!7eFy|$2qDATgyCa;(_-6S2sn`@#X#u4R4}NHL!|$R3LqUApwRz8LJ*A8L6Xyf
z@c*L-!<WS>n$j^L9P!DJ%8XF5zm+l0m{R@CfFMOULBt3Vc3j9cH2-iAeo#uRok}hy
zL_Smy+a85p!9JH+nGoy*?ASE80I(pO38=92`yfulH~|47p8#hNjV!{EfEY<00R<x`
zBA^6_MKlNF#1{fdti~4tF66;y5I#bm5T`<p@s5B1OGG}4h7u!^|8N{J9pOU|uL()9
zs^bte2vT68f5nfn3?>rBvZaV*usxAeaUqwIAP{64I~0O=N<@L>{x6k<7>Y=|OoYj9
zgeu9u<ynYnu=4*yMeeadNfExp1Xz|S-9HMXh-zY794?IiP^mLmaH7ksT!{OmWdHG4
zl|=1NAL7V78!!~nPJ(lVjE4ttK*E7#;@Tt#O;Vggrc@YH>{wnDJEl#Gm?OP}{XI^>
zg}fgDCPXlj;n1cK#SxIHTu?%UJsANOnZK!v7-|lhiiv-O@{g=2H#*2AG!>JM7^+w@
zlp5iKjt>Jf20(Nl6#t0@?G~1d6yt$H{|eg_-ThJ?nDjrg7@HU}@;(e5v^*uw@E<BQ
z;x;)Bg-R}dq%SX&1|iCf^94;nIFS<|$9bWo85B4gc6`vb5ceqv{?!e}brTA0YzX-x
z+{pW{z~KL|$0=|V4THvk0F)5v%#TJxkrHS3Z)y#OdJj#-VI=fe0FBOH9*t0{V!I%x
zQo=q>snoF`34)mr2O<QB`yBX)PAYONt%e3YSlHkANEib8PvCzTNb=w4Fbt@1!K2d%
zBaI<aAUgg)^oNKxiH{hkrooy;!-h3WPD79VO~!*$R1t#G{51}Lxsy-(?*fV$%^Dh&
zKhB9Fm4u;$e-{i)v@VRiNHKZ{A%+7*c+=u)*dHn`BmSfa0&N+oECMA$oYUj*L#HjW
z8VRLCbf9YtrYBQ6<v;%MAoInb<VaB-2oy0+hvQ<zvD7^g$iFKh#*O@c^AG~eWLP_Y
zQ!k#NYsFvLX@Z^s<YEv?WR2J#XE1#eG8kZo=MN6Zd<p3P4+Jklg^>_hE&i`0sG-3S
z$q}TCe+`N#QaK0R9cDl<p}R0@V4s-W#TZ4h<YH<aS{%d0OkHJ0A`FofivxxT!)HR6
zFtPl><gZ%c55Y&|F;V;<)Fm_(g92uP;mR3Cc8Lj!cuk2LkpJNzKe|JR5$EVBgz4-)
zvkLZE$@Pyi8PZ7TpDBuS2b-zLgDd}f-QdOymrG~{1gRp8nF#2D_WyB~?x9DrjRl7h
zwmzW~7psHiT(JD@CpM)q9E1`pE`9$>eyn(!40_N~SaDrorvFj`gzE1M`fK$3`0(+m
zw7h+N{YC#-tzeu&+d^WPU<?z%K~9Br^)D(TPQ}N?&(H1Onz&5=w<bF?9aa-l%Kx!<
zh<@i{FvW~DhRTGq7vSa}?0MboU#{SW9w!9B3L$FQag%eIRUT{k&s&A&UnL0>z#lRh
zQY90OXbu|=QS^+)j69Y~j1Xr2YsUPcrplqSON{-`xS+E{>?)M@KZc{&b^huXJp}*l
zmV!eU%cbCuMb=bfdgj3OT*_gHW&Hf}%*WOi8pIgqziTbV^T(XVSa8r4A2Gr8e-wNS
z6=~doHg3=LcfCgwsS)|;-<UC|<kI|;t71r^A#@UpapRI0jS9k<8@Jdpq2NcFl%d}V
z|CALTB>67nzY8xi9xbfrWIR`p3rqh;Nzucy^D%4{G=7+OIwlTu{XmfOQX<)RAq0ps
zdYq?(4A?$c{+`35P$tA4FC$i?N{9>Td<G#vUaCS*eI-6ZY!H8_mk<$rxacrhh!&$p
zbpDa}Lm)s#oI^+uw~29j=-1BUn*UiwVzLR10EUVjQ~zh;KH`_b_JnyKqtlTH>01N+
zcjd(B{mmQyUmgZ-Os-+|Fgzr=CKUhgx7yz<N6kObV2ojwJ7@(;#3jMMiXWDMEAbc!
z3@nj?jDIIWyC81H{HZY+LjPVyW6(yML=%yU+W&g-{EME7rX!Ls<6gb!x`L5K)1Ziv
z%YRpt3?bZ72n{EOy`%&EcWPq1!qky82mF8PNR^NRcH}UXid-0{j&48p!ly-e3*&~%
zghJqP9R!SU7A8R|>HWb5mmoOCfiNyk%qv+;1h-V9;1EVDpetnvJ}IITic6k+5eY0H
zxa!4<O?3)U#Xlfj#XT|58lbUm7rlfPm=NW}GQNunVxOF1xRv5fF>B24`Yy3JAhw|=
z8HsBQUwHz+Qf|t`;wbxaa##=QFKYn6n1Jg=b?QM_nRWd$oXnchb9^l2f#qXdgVWv=
zf~5qz5JIq8(eAZ4%hDdh*nzJH2Tb5(W<pbO20bI5g0WiAs2rSdQFITk3-8!*oQ%?g
zMI41anG}SzES7qO7^~%x{TbJnMSc^GLRwLR6K<{&fnsGoH<se;WWKtNU1HRqcDZBI
zp#H{09ZrVf!y(QM()kgb`rM*3&Q<009RLLyI$J)4Qpq?fJiI1hJUo7c3Xle2vPlQC
zgGNvX{ebyO4;n~Q5tIXfiR{AnxH*YFuv7QMaz?TL7~JE2QX^kKHd5p)dUKy;M?i2P
zmvop@<8A%3^)dNb+c9%v>fXzFdFw{&3;Qzl@~;Q+IbjzO&KswftIrnpe=poUx|Vn0
zGUbk!CHM%u989f20#;RtQv9kha!E}IMig5^OB~JrocfI#34Ses8(~t6EI3}z#thyg
z#=U%-a!<si6yC$b%(1LPILyt=v+O~5oaSdt*ss%!gkR@j=38E%OhNiZ!>M?3xR-Ab
z4)au`)tGe)5|;B+q}N!fX?EY^&f#>)g`eulT6X{D&f#4?r(|Vc4kWy(BWvCb1Mw*6
zbjR>0XmqRd<nSze6YlWja4p*tZtBW9b@y<4r};&}l@T?j-LaG+8Gf~JeQpK&H-)M;
za6|8cVGVl`mjH^YPA+bHft7Ssn-p#F7-r#RaZ1+Vr8{5lDBLaKYyvOSyVqS86LRGy
z=$DkgrRw35EBs+7{L=@&yJ_Gp7)ek<vmn9Mr}@_(DY{ZJe(_19zZ5-alS2-t`jAW|
zmg?!Q>p@o#Lr5VXGtsN{-jz;$p7KY{@irbf@sit?2BER56d&}ETH#7U@$zTQQ2acB
z6<bx=B%RXJO_JQv2|1G7;fXMk+;LXAnvGc1RsvD?QGJb8DFUQKqX=>LI*cEVcfi<p
zWJfWR5b8i)<-+LjaHif9S<_Ei5%wZM26E_r2Dv*&`R3XkAM)F8X6ZlgaxPH32?{Mv
z=+Ge07?p;byzp!k2yO_v6+h|G)ad!%0G@6-dWX`bazTnj_{&z2xG|}G(R9qj)>!Jb
zmbdS3m5NsmH&_W!Oq<f^CvCx+D2=B0S?LPz;N9jf_4e%c`<C^-Vm4gg;;9>b(Th3(
z>F%vQvPSb=t9OCLbr$ubaGLiC68Q|d1etQvgijwAO*Bi)Y`qhnO7M(R=Z3E3%snrS
zt88cybR&A2={F*hYo+;;hb5bq3^i)y)0AwLD<qQ_aQ(NB_uF^HLR*p#U<AZu??~t6
zvc3sdduR=m%WyGvPiW0g(DJwnXEz!Y1|8iaD1YldJ!w0;GZOGANa79rJmX8S9dhzb
zo~Nm1Yd{`rkQDLqmcLP9-?ZQBjnULbIXwiekxk1~y~!1erdgWb#jj}1S{i7rqlYJF
z8$R9;aX*LCxY^YUn>`ma^o9A;(~#2iU%6Z~EB(<=?rFoU=__~A#(EmnEGgMoinv+1
zMm1RvcJ;=uubRxB)v!oPFFn_4Ioh7JoX>jESeN@kQ^;b~yZ?ldGKJN$B<2<PrXot7
z*-%5uj^D?kK!2PtvD;LV!gI31sHw?7UHJCr{Og_X)7v%`58t)#BZa@fI?sRXECz^)
z=P1dx-0tOV+zJ$|qLB5ugLn~VO+hmg#TlE>@%$V2O0{OIK3qF&gx|JAZrA<BgCV0!
z_55n1czhFn4Y&D@WW%J#_AOoz+N}<KWeNXoX85qrUykocZ-cf$`4;DP#f052`2_l%
z<!^GAJe4^J%tH(fCX5a$b6}EQ;@x=tqc42*#<^R>DXPs^<6k~dNRu6Ni!&vx|Gmgj
zJ$Hj4`KIR8pxFi+ylbvc<`us`-jHy#a7+()Z6R58qai_LY|D%ix+D{jA6PT|WgCCT
zAfTbyUE@pd$O|pa?^eQdR4KPcdLL&ssoVG5;BH#+Tn9m$`v9L4c0$cyujd=SP1`RC
z#g7^5cfZXJJwLR%?{_=JXYthzNrjmpzu;BjC*a;e5h03Q1FDU0xAaO2FWA1sAAWNj
z4=v&fj=ecoQ&_b}SYB>6`S?e!-ZunP(R?FgQjM34{iTa%pA_fpU1z|PbdKKOv;3?f
z7W*##byBT{kQdf#8bN{r-mutIvrosH<fAFxD@H>Te7Efa^K-v|)mhHOZhU9XGXLSS
z)>NN7K<TRPlCy0n$gJ6V?af_sy%)DCc%B;#G;G4}k#8W6)4y}wy4s$sY4K)cZ9Tbb
z_{s0!2Y~26cHutZ)aa@XQ#H;=9)?&$Ve`zfLualS{mhzBuOgD2<w!W}$whpNO5fc>
zB{)U<U`gn;LQOLB-C#YW#2oSQgJ#FR(?b9S+oMAcgT!XlzW6&_Kr8cKkM2<Y$Y`|a
zk>W2HIw4TfyKAg%VJ&#sbD!oaUUs30W))NG&4ig3OqIO*{2K_v%WAn54$nU<2Tvut
zPdqAWnX@)bJl)f?-(40SgFO@~M49m@3(fD=^AF|?wP@W8Y4jYUY%DIFPZpJyD!Qrc
z5}aC@)iml|F7P1qoduW0#lc<;L(*H?!mG!D^3#uuFFzUz{K{CFE}#+1#fGxra_wVu
zU2C)N7DJXf5LcI3uNpPywsH-eJ{Pg2@O{H5c}?mDZ_XoD3#)7CecxbZ+6P8<AMLrk
zzrSG-Ua`_&%a3@I^3gk$J{k2?OHUCgq}uqXeAJceQ~lh=be^)Sr%wx$yw+)Mj()xS
z=gRP`Q-RDph8JZ%h!E`(k}ID+csesQIFxcpA7+aw`xQRfXn3+2|5LASggLe0>lmk9
zwrcmBK#zISdb#YJD@i>RHrMX9At=0_<QY?Mp{i7AQd+Jt;^*_4DoNt9rIlc2BTEG^
z*yTgh$0ENkV~6-(#+syfe@`}Z<-PSivAOir^NVbyXOV-u*X3)rEvEgJb(G=UK?*Gv
zKdxLuOem5jnmZ)NJ&mOdiq|WC)=2bd>?)bo;dI@7HK(HQjHiJwon2tThpM)p6Koli
zJ~~ca3-w9PJnQ}3`+7HR#iQv(!<LVsi~doC?Z}%??xC3*p?lsQ4nGnr+Fc9lpHlj@
z7!Da8g3at#rt?se_V+7mb%vk(R25{&d%x<=uowNhRAV$bdQOv{KI3?TXeaFTg4d*l
z%;fv8sabaFq)&r|dv|MeVNQ~YjnWrorKVgI`fvJgL@>kDo!~4EMr;gnoV(E?{SRvl
zYWZ$NP(I@{6D4w&-G6uQN9LhtgjV0pkE?Rhm3#e2JBf4JXT`?DUDF!`r+aG4!mGsI
zJfbW566a(v(H^T4jXvbzB?98emTj9pWeI`mC91WSeuj-Zj<5Ju%V8%5BC}r_1~hHH
zn$J9tm;>yPlgaX*8vlHhD7@*|Q5Z7SpK4#bzUQUfzWF#+RPpX`w*09jjI*70b;nzg
z3Ti1lR70wSI3zuziq6-*5rL2!zSjJNWYRkRs&V`XQFZvvb(wpChr6xiO;&O8%Sg_4
z;Z^yQn-q(ghoUE}H0Cgg_Ea|Z<ayhB0;^8q0;}-`@xmwR$!t?^dn!rpbx#z3seNb(
zeJ1{x$?c5k+V-02<D}myGSy7_?oW%Z%Rgoe=@{KDfSepto<ZBrZKIzJpNO8R^@$!X
zHr&spskRt&3x(gM6xcM4tTz8<qfj;yLiONoOfCG^{H>(i_39gEFvbp-t!wbMV6(Es
z6E=p6;p9e02i4(S1{nKgirrvaJS*wlwj(A{Qx#isINs}=od8s{n2VUTF11Jfo_?Kd
zq2B$K3Nr?mIU{8z{)5@<DPyZ%XVJB6MGpB^yO$OErP)tohy?bj1d^Ul)ziLqWARJ#
zCn&!wAzB;E=PtLm1M551XPx8qmgJ|C9WL$iS1RAleO246PUG$wc5$sbk&EK%Zm0#H
zxsk}eXbI=0n+y9`A`0YxFwDU*V|mRn3{>y+)7dvkps!AEMq;%=+HUBjec8sORP~t-
zFTW1!(uSObUP<ftI>*zlh#RlcTW(Bno|QF7A+y|r8+WF?B4F>gq>k)mGASR1qnuX#
zn{#^OsQ1Gk+N7?vXJ>vO2?ptW|5<Xbe$F!e2rw^qyi1L+9HDo=F-r(KJn$W+|7gNF
z+#bq5u1dclyCV`svG0C#@5`QTkzGUKchk)2B8mF;O5xgp;Q1<wR_eaVHBSGB?@V+T
z7qvZ7KO)o0t$x5>J+n|s(1#SgBdB_G8~(kS(I;VKs?h^ZSjhR_y<fcQ+9$l}o~qyP
z)Hr{xgk_EY(r}*vyb^_k9Q@8pqL73AHtvl3vh6jrN9ciyD^xS<+f68$b<84sRG;5H
zc6nH=ia~SMhr)F;%Z%*V%u-6TkCu4+Bd>z|ZC3G)-m!fNm}1dksun9zYpR53<2Q$w
z<@Cxmj@&oS%rsOvj0f1*S*4*al_s4rvsDY-)Fm!f&pF=xX!|fIb<L}rp!l}V7mbm&
z$Xiz`Uj@3BNb@f)TkvjtXrE(ZWb{AluF<E__?2@L$wf6B61m(L<Jl1_bGPv<wV`-N
zv}*H_J5M)$85}k*|JvpERe>$Dg1Il}HR1}|B%6bLDvSDoWT$<IZ-l~u%0q4X<0QNa
z?qSG2+m3gM(fq_2?866aC!#clN)K)aP9DFW91z7T6|=ZzZkFg8sZSl3b}W^>Q3mEA
zdlmJ?<&MjjiMFiL=>BnG@k{0pbu8-nn&EPhNsI|;zuz>%yke>bSf;GLu~k~Xc*{Hg
zcEC)1uq4LrQg;^1c+8y|+S}0k3iQ40A@_e5h(c9PXbOPg7ugHI)2*?s*YV@8>GpP}
z=w2R&H$Tg}WTIanGb!KU4_XQz+fenDP$5;&F#ec}r~5(07as4z1*X4qPW+AuOwe!~
zUE>b|(^^^cz&NVuzLuKSlzdesN3io0_-Q%XF7%MwgHDm_v56V%;{&3@&rD6MYQnPV
zvv@Q03Rfz{S}O7_%AT6qm|M{cE)b{#YgU8^XM8Sdc%`JKO{oMAm&MrPBATCG3ORNu
zy%c}y2fw8Kt7atrMTG39_`4^5#%w8v%Z^ISJ3V)l=3uk&tM_EP;;HV*4#p$y+3fWY
zv04498H%4)syKA1yhOvcx7s71RB^Q2u9UOg^E*OzH2(DT0FTY+c$tK4?AvmblEOed
z^z?w7jdi=nRw-w<C!B5UaM_-1>}WZHjdi03pH1Xoc|797R!^+J2jV2F4WIkHl3zd5
z3lR#>6BxpPX~UcGkH2?+&2)o|M`xkPz5<!@KNgmV3>!<(YQrCgu@q$L%4R61mR0F?
zznwllWLMdw+U#0}Ujh)4#kyvZ7Md8lxRP0P+Ly$HO%NQpK-yBHVkgLwy5e~Jh=gK~
z@(HWpZhn$d<|a0(o2LY!%$x_nhVC8mnB%Vd<DD>gHAf0C=YFsAvQEt%1z8(n!W^<(
zS!j!&c;IUKL=0m^pKMM7U$<_kbWSp|OCS`Klen`a)yg*3sl99vK{nQHy~G?rH`Z&s
zq;N(#*1zi)MGhy9HEY(PC#EB|^m`yiDnjGlMWe=LFHmv698TM8mC(glz*I#w2H%NI
zT881fkj`<>;iCwSyDPhS1#jfV$-|M$BFjF_*G>rbD3s#AcZVD}tH4R4$i0ca08+t%
zOK&@wKQP<ir9vO~AfjF@mEI>ZhT1JNur8*=snuCict<;`1(`rnJ6}+L<gW@7Pc0Zd
zpzl=@@KgA>BSX!j4>CLeE9j>C**hyKXu=x8xGO30irOPG!U*ob9<OW#XecQtUZBVi
z+!c)}9rJ4g*nQ=hNn$x$`MdQw&y3)UNe6WVu>204^bq;vs57M(?=H83T$LHa&ndpn
zJ*F-x=$O@ggLm{*a+9OAJ6ZvFx*sj%KvFQ>u6N-mPc%_<r9ORTzS;P*mh+FO&uuV2
zlGtC@!{(H$=u(Q~T1x2bwpiR%mDAulhPIBBQX8F>)0w&+`fBnaH)P%#a3VkqYSDCq
z=}sKlk(uvL84cK7G7s?Ai)CD3p-H~)EUZ0lnG>`DV6IPr<~pxro}@q66Apd)jv4e~
zndL;1h0fQ(cg=prU2VVHDdAD&j!ig>_#5jq@m1l17qy8NPQ9#e%S?m_wKA(u{HjLc
zxg&@L&IRDkOvx|nkJ3<!Z+guwp4WyfD~giFdwj7B?|Alp86?pKJ+L;8ug!T}65hql
zvT}Twv$MH2J~en|sq~d&FeJoH&J=%3v4PHrT`y@rG1p~>BjV(;*_M~tPo}DEm<^KK
zXR2T>W2A^P0?bC`#@2Db;~Q(-%E`I+vGOd^Pwm0O34w__TbwK{OywTKcQa~Q1Or_u
zjmn5}bKvF@6|#vZ0L^T6e0I3Sk~1J#laSZNC5~rU@w?i)1-&MBo?+>_D=7L%)gRaI
z9txljDUn9v#|_*$=OmB9`3Y}&!(N(zz3$H)2~B?4BrcyXs7LsvK*tTc!&nuR3F#~l
z$BtXlqT%!+?PPJGF?2l38QXn9H7#@^JXYw<W9;zfd%c`aHlw^m^%i^%nUm|Bju!?y
zvE|n9NvNEPIx=J?h-b(T8=0I(lNFpggQmZHu<sxXUgc(5!e?A}n0{#a8K!_IycTf(
zHR88c+NhSA@Z+vPW=Mdalu)0dGs7OCU`iB!3Ix<|s=;P#dKZ|JLbZG=hs3LvnYEKB
z6nJ@=ry|<AhS9N~F*No0Z*5sf(@J{;+v5!NcV<-|@nKx$OlwlGc-Vx90-$H<*%~5j
zZ4tt{U2s-Qdaik76fb=Ogtf1U{3u1mUn^ZKyf;=ZJa2nZWGlpK1drBTG^eFnF8Afw
zhYlHXMhJJysH3JVqO|LL>m6#j2b8p1SL+k(quAPq9Gma(u-t#TwK%GK(u?2h#>GQw
z^R{?^NBst?ZIOuIH<pM?w=IOImy$9lPpaU#>ui&SN3xNup0W);T;!T}0e<g~<;pB?
zkkG;)20O#R7LzrrWwinm1Kk=D(Gb!oYZbieH{}Q07XZvhA8Pa!6#~o^mHN_OG`JJT
zuG3xI0b%V09DC-6l7#^BvB!X@Sty_oLW({EwXIR8`B($M!-F8lhX8y?RtG2)^_mpW
z0>GR|qCzhL1PI75a-gwotzxv?FCcPa2*8V)rUNu%`$45K07|jvjwl6w03$i(a1v!J
z3oyhUL83~P0TLuw+JZj74vMuZZw~m3v(IM<c!@o{M2$HBoNyXqZU9c~*(=J@3vhuA
z0cGtAAi<twqTB-j2DnyZ2!Iq9S8oI$14pxq0^mOUpzb{Y{J{AaoCFxdS=L4XY{;-t
z-ys#As6<Bt!bbhr4IT8S0ssnt4HeMpU{H!?Ui=BQ_XQdb>{)5TEIFS56c3Mx6c3LJ
znNA8|K<2waNl{IO07+bEUn&3}a1ivj0fKSPt8@YUfn=Do){j=Y3jO$acqkHNR1$z0
zHP-{!z{f(;I|TR*z{*^TBO675@bKoLSQ%vXO(+ctFbe1bVV%>n6VNsz$HVL3!I}6n
z0l0(f(0Lhf4f_od)&2vpi^HSp6mT79c6(#9TnTNK4<9pr%*b7D^j8jFPbd+};5R@A
z>u4qtc!YK4AprRP58C)ZGwc~R>NPp=3^!6O3_vgJ=`@O;4cH99IxWcaOrivRN2;6x
zW1R&>%meJkNlyp^7lByMC*#=kMA0%zmylu;Ksxlj9}?7(7|;+WCng6x!hZ5W@u~wy
zabW(?1KN>db=e=qC#ys7@Zt!O;_5(V<QE?(73!f4&=BXyyaO<o1MB)d7!aKvnA9DK
z0T$vQn}B|e`3l6tdjrLE%!<m52hv~<+)<5*Ku=uiay$X9<3@roAIOPI7m;G16mGh>
zl>!5BsWw{$48~b~!f7i~1jf4LR|@1o!Rvsp!4#OO;w`c_xP#{WBF4j$MwsF=p}bH)
zDx7{)D=-LqHwE=`7$|@PnP&nRjq9;&1~`xFG4T`7P60b@HfcfexIDVU2uj8R)5HmS
zjlCX*YL^BH;}rH}L3Fq|MQ{~#6_@#%@*p!@pxH_w1db-A0`kQr<L>8HHfwa6gMmmB
zc@R6&$qR&!no<MZ!3k<>fIv8(4Rt{UxYnT&s0-I!qbcYyu4QBan*W2BJxBvb3vvXZ
zuUcUWL7XS39G8I4y-C8v&^PJmXp!ljAa)eGJ0o0b)dYb^aC#jfpeo#m`rQM8ajlSO
zkUGwO+XIj#jz*ITBFA~e{|HopYt1|XDdNfoT|Q_PC-=J$bd>~~4Oi<x--)rQr0Nu?
z^aY&_a6%+NA4rF+hM`mGW;^Hy&IRW#&>LJz@J)cUaY5Xf1*PGz1<!-RajmEYP%y6b
zYY~)*3o$u`OF9yb=l~W`I^_LT5GB$e8eJf!mO%+PSRGeEzPQ%J8t4};0Y*Rn1#9{j
z&}$YfaK=R7Hw;+UX}Q7jI5`V`@B$&0c0~gGr@Dzqfq&!t5RnGsKANHwl)=mZ%y+Zm
zYbxMB-Kv7on^Vk)DCmQyaSGIiU`||1&Il|(h*3bfS%V=s4IdjYAFhS81#jSV?_UQm
z;51y^z{0pzx;uD^kPwsiHq(fg14!j{Fbnq571B2e%7m=)15c8oE!!UJPh1q@;o+?!
z9XG%XIEm^z;1R4-k^bO0Tx1RrU{;*r$a~;%T+0LocEo-tMAhbk330TxJTNza5K~lL
zo-6&jhg=$jaAGe*b)-P~kWT1ZIw*~Na3s#}-qOGPE-D9K#toLQA)ZJVx*(=O5ggR?
zNZ2bd1a(#c{)n3}A8No+*e~EH`&VF14s4OTZ4G<!37x^k%*g6bU};#J?cGr7X&Pmj
zkNscvyz|z?6QtgI9DS&1bn@BJGGo_Z)Kk-AkG{86C(j%6bUx@NZSp<UdsaK;(RPiA
zO^J;bwVCYBl}(n{PH*q(pH4gmpOwRo%OB?j?B{;`=$5wr>}yxsX5Nu}$E)L<fbo&Y
z)~}1|<A6@+vJL&Or6=TpupU)LvbTO&aW_3rlt{<l9)KA0ikBgbkvcu8(Fdzy8p{k2
z$Cp0~#RQ$KmiVMDETXJE&KYbYt2#wJ4)r0Cnn%?%C#0htmP;X09c7*Sp64+@*vp^B
zL}yPnW~f7RH#+zatXF<sBR@CVk@1-EojgcoKa(WTrkBbJ@6vJSg?)?mT&rV>vzBl!
zXV8EK*iPxWS3bB=RC20%=0b8SSt_RJ%C(GZh(iMjc?LEVkydcsv#6%3tj1)|d);CW
zM;Y#gNk6U6pv}l8`St##|J32=;9Nuc7|rUG<kPpV8<Lumd4Yb1-*vw+8F3-Uvj=xb
zTrFRb7SC`owy6#G_s7GmA3EyAZ#iCHTiIw@TYKr~7d3kFwN*Srf9FZ9nn*QW1;e)^
z-$Hc>0_L!dgKP57obz82g-=dekFamfJv<&|Q3_m};J|k&a7>MV)A@j&T9}K<>4Dvv
zDJ1xOPkUn@MsAz<vtd*Mwm5YZvP&hTCTwHjQsV&Jun<vBrbwxV4bt$gUJF#b5*EfG
zSLr)UQ<bn8pk?17Sa@@;n2i$>EA(^?9`L&A+3SG*vpuF1#V|!ypQq_fMZn?51K{XI
zi3*bC6ve}XIpNnEw>#Fi^6r(4(Ir!tUF$6^LcF(#h!uZjX3Q|9`}`8KT!eGvaXrbc
z`d&}`(JCVPF}tf;PhcuXuYa@!_4x2p*H&yXN4=0|d)je`r-WBN_?(`t%`-Uil#E(L
zsxI!zeYnFsRr7CE1EQE;SG26ygpGXP6Sp#!y!RKV80WSUs4ASiX~@7k9Zyww5-8#@
zvgNMuEXVem&h^Ql3N0^QCEl4wo4WJQ4TZP1e+VuSWJ7b`Xy<0a1}qS}Yh$vny#4B!
zgRHuF;5&Dom_XLQbAIDadEkedeaQ;Ye#al%Qs|8;bf!ARXK;VcOb7V!bR})L#Yo}$
z@#o%h7Y$UA|L0n6%ludt;3e<Jy#qq2Z&j?_5{!->XzV8z+fo=$(HPfL8&5sh91_|0
z%iE9!7A61wDv~<!493f_`)LsIc}=(0pY!sG?C&90iR)%%4yo5(hb86J{dz6hm6CIL
z|J5XXaLm>`JZj)TDe&u4h801M_*ZrdtqEcSmT6B*o?KQlc71eNf3(^tOD{2;PNhjz
zMxz9*U;0z`amMon2><mv<(#hj67ywqt@epAgI2tkc&)p+XP-#HK3+bwe?qM5Df%J{
z`HqHbP{CLHr2CBwcN<~GM~)$~M04E$y+8qP+aCI}+MpgT^(>Z0AjrIsyU-T{&aVLZ
zu||a&4r>xFw=SYrE0hAnDid-(ol4g_m2@XQ28SwG3%&f7L{g`{TX#*ZQO!5K%<1)u
z(B4v;+BDHo3P?=75$rpWW<*=ev%6oHYKvLB)n5ilT8e!I_a-X+TH-q4yy}0Fciotc
zx;p3jCB>p{o&#MP<ribtF8AZyYV2cGGvajYG$;8<uOAT7^trSVQ8mmF>@YM~{%EAp
z<mw5j__Vn%F{y8v6%$62QNtiZvr|KL{}*-X^QOe-4~L|-*6uul#q8$fpZgPv6yj$h
zR7#VA5=aVM6HW9gV)%$=;_Qzimcxndqdq4EIp0|l1WnC3a8uCO5^ie7>@WjtP(-tX
z6Xy3iOqW$pGKl0oK9FXm#0^zNRV!C@&!rq0E3e)<G$Q3b3R6ttncn=lA*(xadifxD
z=BfbeSofv3N@tX|Frc6iT(*^M{peu!CBD*q^huZBZw`CZ%61PwOe3C{9q^mq(WBe!
z9hqzv!Pw-1sgyHAu7^!joT_MQrU(7kugwIc<;<5zt=W2DJ-iihsnzf+(%x4DwcDJ%
zhMm1kAGk$udOI+9vk2Bs7{h(|V|-NB;WO%@A~6ohLk}IjVNZvgpDvM5A4sg62!Q+U
zxXYg2CBwU$$hSTvi{I?e5rMC5iMM3doD4Hr`F*wPr)SAW>*a`);((#4S51?zhNl>O
zE8^>`CtuA>{q!H_JH4EX483X`t|VvjIU=w4=+P!3CUb1_?p3C|F}=bgNZ!~7xI&J4
z=9s=>Ztcx5*?1UQ;qF!Rhh3J^K-RB;V_{0Rm4U230>^qX6F4^`bG-b>etg@D&(6~e
zF`cgja?a~gl9sBxB%vd17HgC9D&JuC3n23|B2IM7X)lx0+(+aL%Whij-}{B;1nvi<
z1>8PbxS4-zjN@1-UUt)R;grN`^wm(?xMfa2-&6C_Y*@g%QMn<x>bUXnJ8@+j)YX7N
zxjs2%=(FP$66;Zc1%`}(oPfx#(=X{|a(r_)pDpD$eOoBDyRxZutR&+<wrgY^O18Y#
zdL*VH!*ai+=$Ea>){|JRoa}7)oWWNh2Wmvk%lv8DtZp@77{}*v@~@ne&ji+bxjVE6
zSm1K{1N$(ZpWYlHlpD+(&-8yC7bp-rEI_I6xff5}JV?@iQyk1S##r{__=f^f<l@2t
zUH+-#!OY(7J=PX&*MWr|<hPTz^kjrii^Jq^BSckKSxru*7KOfjN(i7jr+)|-HO}hP
zpJ;$S&vqhiR(bfqIay1Sm{KP_KfkD1W%Pkba$gNCjMKy>TFveQ<d&|6t5lgCT%`<L
zum)`8doIqn)4(6K&COpn{Yr(H>bp22Q$slLijGO!`z4^To>ZTQ_ar0XJ8sp7b_n7I
z*|*Fu?nJ#e$cIqAs}S~!x=JZ5&Umen7TBm~lJtHX7{vR@RjSF$2Yd^eFI_p0|MQ2d
zgqOph5)8q2>XUBrI@`1bze@8i@hs^~K^6Yhk1T$Q+qVkh=SgJp*J3P%h-IFy#ZyQ_
zoU{b+7^F#L3aH^gCiqiRvn8_kgifjg;E?)WKVm(Xtk_k*%X$={wCAL#f|uPp2aIzm
zX4DIC>t(V>+kQ!>%jNvj^>_+|A<y4+j;X#gdIV#%6;<-0(=+tG(*A2-t@O#mWz_II
zzp%61*+d((kk;xAUEhq!EjRhYqcg`xpFXsmc!sj+?fNOR{$$)D5%g7eAa6e>YrtOy
zoR!yv<U1r3T*Q0Gq<Ynaoot1qc<azP^Onq>d@kCpY_7c7@+p1MQ#;aNwy`icki}Q~
z<gPBPfosu$pt?ul_{uk@t!qP~+t1_91zL;r)c08levGPpsVh7S|22^R^QC6N@MVLC
zgvv5MSrCiTSNMQ))P4ql*>@QP{^k?n5FhiqYRkO6;sQ;cE}U-+Ir^#V43j8bZWGBD
z)%e)uB>0)X5!duK*H&BSofa=`DwU*IFDkj72=kxf+%FF(CwQ40A-oe6zs%%uTrYCM
zt9OOm{bmo>*>=uo_W^&$RnURxho0&&UZL;(C)2e{>=8*$xwA`v&>W}S{#yF>(dx0J
z6NfgWQ?86NxE(DBJD^*q3JkKj+_3yTzdWYbJ^;@y^+k7l?+E>4TCreeHYdB8wC9jB
zSW|c3$&e)_t>0(80li8vba<MlHD0xapU+0maY6bs{a1;{5yrP3?=2%f=#%WnrE#Yt
z)b$jK@pJ{hJDBn`nXhuYe6#4JylH8od(9fs^u}JeCGPx)^iBVO`B?R@{lvw?MbO!x
zVRvNKmF3P0y#G07vPEv76xPA$qbBs)9%-=w{*7J7TWo@ta7%8PL+~VS`#^F8X2Gr5
zg}#BC2?#NpfnVcwlNHDgeF)26m-^?h`<ngVU@ic5GeJyrO(zyfPLGrLbHkq)WqbiH
z!)+AK2q1Gfv$I4HL0pS~1oD9pyUPoRSsxif?=~C&$aFJ&dhC6C%&mPS11)3+>w;)f
zL{Krt1@?dL^dlANAVb(di0C2fgxKxH*5?llp~y-rv|J4mDuL4Dghb;48|Q-X<NE!@
z4S9~em5F*L4EeJSe<cDD$8w8zMIqRWho}QN$R<wVlRN~yN5>pf&?!Q~NwM1tju+PC
z!~eL9yFZV<T@OXhJ%!RCm-Qgi*e%*CeaN3pU8ezL4TpBI6=WVjfZ2o*5?t{>E)hXk
z|G9sUY`1|NVNv<OZ8aT<-ogA}L=<q+|8spFd7cZUL;bXcB;Xu{-+-_Hu)8+juZ4$|
zXs33NX=eBg|7c(?+#|>Hp!7)BOb8v4z#Wp0#jV^Og5IKH_L<3kkdHW=Jp3WNxM0%*
zAk5f(CbA|1a)I?Xq&=n&>1m43{r3g=LoDpR;^(*F$XfS58S>|jJTbDP0LqBj-Vve1
zVGuYj6`B(uGq|iF*+t!*K;HKMmlm=!5%LRrF0-H3GLuJ$hX<v{oXgx1q(!I*LSVRC
z>u$FLJp;o;%{{LB`g&tYBG<iL0s<<neFCX((zGLfXML=`QUCM4Cq<XpV1Jy?TS0FE
zDR?Tcp$9iP#OL#k5FLDJ`Pp1s5Aw<ty22*sN(f-qHTInzF+ZHLrs-Cxm0~~J`J{5V
z5!FFFOd)Uekooe$X}jcWSp8GLikyFU?q=KZtK;9z$L*4*3ozbA@cq=D{pcEcM=}+H
zNR<`t2j<*;x~*y}@!XC)hg_7!nxVo8<1@NB9LM$WvGf!12hY-EjaPsV2r21wTUFQe
zISue#L|TQq+`=8xmx?J{bq{V*w(@k%Ql8mIJLw$g6E37L3ED2uz?Q8!&+P7(6l`4K
zku2FDH5|Xa=g4(`f=lJ4{y1Y%#uaF$f$Dd_1s{P)VId^p`<_X#z=Pxr79*0ZFk$&Q
zk^8N+X;&IegG?kF3X(rP8Qm^&bv04H-?Z>ZDVyHxo2hUm9p#Jb>K@|$PomRJ5?kN!
zLVmYQ(GPp2tXlw9>iuCmM!ss&;gG9P{FWKt4_Z$>_NKqVYp*e|S{;$qrEiUR-V3)I
z{kHi%CtId}VjPtuEpY$hw~WZe_g6EJG_x>E@#*R7^Z~anYD<R^`^H8@<ZIi8&AJM*
zk@yhvVea?&w5xErkY5LbpI1d)AE}A>Xg^U3j{NnrUV+H^h~MQltj3|$Hn!n`qoQ)o
zhk~-w<=wD%U)~?dQ^`5#m!uZIOAgrg(v31dEhbaE=W`~s=Z1PLt$lVZS}TF?s6PG_
z_)gC3eeM-Y1zP{7ksBXN2V;Pt{*Pu38h=yG@b*`;eF*Vc<eBSCa1DIu!7z04EnU()
z-pG&*=D*#j-sE85RSFYP(630W6=DgyGfg-$%P(Rq?tg12P$cx>V+qd{8apdV>y<Z#
zqcP1otVKoE!(~iFFVt`4O#>~n^SZY!YP9Zn3$$${#A!CZ6JIRJ6S-l*<&yj|P_bU*
z#m-N7;<`r)55At@(D#~K!K-oGPqXI}W#JoDu3x!&DaNfvg8kiLx%Sd@k}Lu#%}EKX
zq=^slZA2J{HiB<}7=Ay368%&;{BjT9$zOeHgl1}4^VA|h!}$2Jg&?oA1isi%lglID
z7geSHbkuPX%%@_4KU}DfT|S(8c>90EkNwK@LyKfn>umcvgy*`&m$iZd78|bJ(QAhr
zZ-@73hvC}!Pq}Wfp289&Iufh{(>_;34Uk9`zL^Gd8Q5;G-?}X*aElpSUY<)`wPLE*
z=B+7!{td6=H==Qp^Y!&wk6;%Ed3E5;Z0dQ5Udg}WrAxsemicZ>iKjms=)@8FVrsPT
z#>}L^(H_h4y;#Hd592>{)V}r=&XaJ3IbI=RP>_8Vbe}cY6#(mBh7TEWEPe1R@xH0#
z#pUQlm2yR|Xl#f2SRtS8t3Xh$7AbSkw>3&V8Hcd?NOcp2NuS}n_hy3=IXk;&9Zt3=
z16mAnUj_c2Bb+m|yJ8k5tnJ-WYV7zV@^k49pCe&UvGaBM$10p8!#dmriX<#>D~fII
z23A%A^-BegIs|^O@r!V-*ku8gLw<gj(Bz4m&ieFC87D#!A|#in!r>FrYU<o(-0g(M
z#A3x?m24b31B$gu?~J^CSt#Fqz<P#%%;@CI*9_7hU^V4rSVtwh-pn@Fd(~G<@1*i^
zBS8?FuH23%x!7gDJGZLiLDpmXA^KyLw@2%}Cqz`zo$X2uFvT<1<IAsdvU|Hd172^t
zmsHF*Ss&~YuNOtwBrF;w9nOCMt2TqO3m|tcw+olEr(B4y%C<xMAIi4S9h%W7#XSo?
z<~V}`o@wmXaq_{9hijNgZMY>#FHcM?Z`4wfmd`2dX{+CStKRqa)+GG|#Or;h-P8B6
zdO}@K8uldYWMG1K=bkItXx$~xY}5SYdcZ!a-k@YO>)fe6k?M{wRIHR0gLe(Gj@Od@
z`o6K#uqOFft@=ECa{N(%i{y|PUnhG+_PyuMqvL)`mn?5y&Y^3$>KhdF!{Vx_e^4K5
zz?~mfS4D$^B0mJVI~4{bl^=0cNuoDev-Y{DS7Sm}R~L6++sPphlj<!#M?5P(O4}KU
z(%W3G8WXVIbS^y7v)+^{8Q|RHRw_@Jp9}|-&FNR9OA7g_wU(pI4FFJ6W|G(O-$ta@
zByJA439S)$+~#PjCmpQ5booX`?A&s@-lDg9u&njRF15Wtr$Sg0hqavbtHjum=4!JX
zp8=yyL3!H&nCU=E>?3!k45wtPf$u^u_u7X#z14r9wR+Sx=G5_TGS$s6)FETvTmrDx
zZ6BX_cWy6!{Nzs*u`pHXtG>m5qELKoG1|nb)eYF~oxonlk;3`e=PsRE-Lc@i6!m7q
zA4V#Tqb0h(R=9uHrOKX{lQYF9d_nvsGm{eN)77iffpHIVKB!w`pXLSK$xxM3d6}<C
zG@uF<cudl(8@EoL-c3uG9%F$_exqwOOu=b+?PY@fF8ef}*9!Lwf70~lw53`pS9M4S
zKgkYe+3UZ|(k#ooPG)w!PQ<9rv5L#AO|uNK<CAeL<=!pH<qKQ#tT~Dsz@yqF?PjMo
zv4$kUzr$*XgIGN%uDZx@idN9kcC98vOz@4wi)%!BKVqtZrYGp0(?zhRgBPQfyB#$E
zvdNP70H)-;OTY*UQ-Z2ahESj>{W&;(Nk4(}fKC?ANz3A){v6>c`7}Xf#hYsOM52(M
zt0#ib?Fwi*xZC6SdA}{49_=J-!y}ui+M`NXf529)v|QTxe>0V7hJFQkP%q=1>vluM
zkUgCjbf02xI~UyjJUg?UyB_-Z9fMNY!4%4a#i=$ZBJ{w$G>E7o=%7BU!&N~$ja6$(
z`Ni(#R+b9Y4b55Y8pW3$JF*ErRAQTN$==gCN(?v-bDB>1nM-}X&g=Act=_OvS6T9B
z5^o30Cy__foid5{t@Jbxk9$TU@1XQFA83S{KO5Lo%E54>$oVaGgW<zLa>>}lB67*m
z0MS*&Go1>_Z=K3Z46+HqY-cR`JM65s<mYkgI&Kkkk5}p|lC8UWPNXld3LgL!`iDNe
zF*_x@yc%;dc{eZfu>3?kG%NE^zJ@xbM&eu&7Refk%oL}+mI-y0F<I_)r2-2Pki(f|
zEj{fu6Y&o|5<OiNwzie(P`7rqx+Pp^QzdffK=L?As>kfBKgu=*Aai~2xX682F_h}A
zKzAj*RocX;K%p#(!?vIsbtCind|o`Db}ofh8Eot_Xd1THMiPLs2g?QbgXeS&AEbV`
zsgUvluKecCE_fvMUe+r8XF5N7?O(CXGl+98W^El9T|endr#E-FmS3A1bZTGjP|j60
z`(amU2I<dIa6E&2S3E!3goIK+2^^!T@FOld{@JBq_8Gv5F>@mH7nv9U(rFV+kNuzG
zpB3Mq|2>BKc>jCVXNdhbqzIa7nf6w%M~phITK<DP^J)-c@V3S$QhOQlK(hA^p;uf3
zyd^*Ja(@mSSeP#=O$Zqrms>mz$XK^F?_qeDS!OuMl1tIqWTMvOrbqUZx1DdeH!x%F
zMs@j_4+<6+=k*XjIKF?gm?kZ&cH`?<ZiB^>j9Q`bC7$Gw&&jplALEtgOkKKw#!_`$
zgt9{Uchy(iUc6W*wHqZi(Ctt&PSDh4;%Q+NZnP}0Xe-T>2((|k&@70KH{>&&^z34Z
zrWPO^pJTtB+1a*QRS%YuX&WvW6m3D}o;;b#M)By)%TGCV2R!$92|hgR@#=gYlQ?_b
zbkI(P2(=ij;<#L|wwkHV-#dNm3=nV7v+-y<`PU5t%oZa#T$fE74XO?hySMs3K>gP;
z`VXMk#dN0WpdLt-yfWqE{7Uo!#8mXXW@|D*_<(@v9q!}2C$5t&?%`WJ8BRw_&=XTv
zHxgYFas}$fw(#F&JF7>#EO=E*`H(i+FOAMlodu#)pSOC+6}RAOe7Pv#7;FqmC6}2s
z$k{u=VEM9Zf2dbS#aHKc1%l7>hEWR1r5Ov(d`~(HzVUWH!Q%8f!66UA*2_er<b}le
zxnvExrjI39smc<DY1fJFPg}6(i)TLJ1LT?%LXMbHoMzyPT2zS+VhKSh>F-|YHS|YV
zQ9OQvqW4nI8m{AxIi8%XA%gjqZSrZ{Nql7#p+&nZ`~K?AO*<y;h0aki`^@NTR#T*n
zGUDGY`y^7{w=7m50~~-=7aNWVKd+2Bod$>kPR4t)fhVlqOc7zGbSClmn}%aouXxmY
zjjK1U%9RZ_dA@2VnN40;2_|iFDgOG}>7OLWjEBH0LKFM~^p%7<J|z3a|7Q7h-`j!y
zzTV#GfB61uP}KjX;&wTsc7zes(+n32?jbi*0U5D)N%!yLOG8Q6*?H561}F@4xXHm~
zVjo#DqDIFgB$*OulPuDEK;<5)7AB>rXl=5557F`W3qPtVeO$NPeDCJ(9xuSYjE&uv
z=C-Y<>|i_HXbamvJ>S1z*}qHWba8MZfS0A}em9@l&cUyd?o<9egoRa>jL&29CA1x{
zc+P}KG<=!ogcIuIfB*1VKe1C>b!aEZ>3jF^K_b*Kc1A&r%JI09>EH@oL~igxV3&-7
zA8W)EXffJ%>f>TTbh|#Ry}t`~?HkLjbEWAM(4{l-NDb}CkuKws$!Fot3TGq4zCGh|
zC$UhXt+^17Q~h5@m&@uAiQE2NuN$Te<%=B-ygr@xK{^U|_w5hvenJ~#vp>+LQ_wy>
z<@<GXlk9vYs-t^RHuRZ_k&P$&Qn|%Dd{yG=XSJ#&7L1JCjU>><zWnDfI9(i#W@Y9(
zcR79v{_B!5I%YMh9%gE_H7^Mthef*^Pz&C=E2Ncv?pB*1BBL8r$2${W_$oc&c~VP-
zh7_=#l*H6BMXJKOm)EoY`EBZL9`WadJH7c;CBo4jBIFx=fo}B`dK}a{LP)MUC1?m0
ze+8HGvuZf`cAB0Xr|`oouxb5me~QLhAN*dw+>)UNHnxVHhZ1ES6{!y)nF&>b%QY{F
z9#@XaXjAm%8;a}tlu|Ig)U%x;WG4H@VXh|ejkdhCZiv*io*&+;6JtX0mgm-kg}5fM
zx}FRXsqJtJn`Gt2zD^0kbdPY`0!^5S=Pk8QZ%TxuE_X}lCdCH58G%WTT(%Tv%(MU^
ztyUBY94)ff(kQ92?Y7f>gc(yj`BgIci8-Dy7&sHhUKSoU%~2c)&hv6k`Rs3#Z@<K3
z{cg=ok4-O|+kxak3%`Yl$iqfKe@lwzyasiq<>pQWcBS6H^|s;6rY$p#7m+dZ_zcUd
zlya`kX7))lu8hDb=xvyMpa#*6QZ;7}{1?4)C7IQl6>?<_4?15)GEyR?6B$>tI}a>G
zZ$IEw2%CCEUmdY@nj6zBVq72i*mWDaMrkYfATI`XqtxG|QUqVd>Vc^{C)s&Qttrpv
zhk7MiFXfDo79)y#cCP?Iy%rD1`!DWJ%IZJ5XHoQggvMehG2e$4_Sxme;Ays)jG*<4
zjyl${0I8&9`l}aPRa|_p$#y?0oo%g+<;okeMHU2XDt`DJzNB+3d1*z8nw?`>QX)^{
zX<>MQV+y<iI>M=|{aW)O$ttad=G%wgu5f%Omn41SpFO&b%9GtUAQ^R|$Vm>9<F2Gj
z-@ST0<OU;PwxJYUH4J;NsFX3avU`#HBXw~1Ojl;Ry|VJ?$7}g#pJp5PJ!UG6sSXIb
zwB(p2TG^{rCpY<8jx-cMB#hB)g<bu=Nn*t88+Rl6#~6yhu7-zSb9G_Q$Uu|sb&dA+
zZb5_*gH<MY%=mVhmv#T=r@s5OSDvN0$jiAB7|*TSerRQTdizWimM}Vi7nMOW+)zUO
zZfZwY=-!?1s@TdVs@&I?D6&58dsLZ9>3^yrPVPPzP1WvE;CZKp)DLwm#tT1Qo1ZV<
z+p4rtN_xZ18}F<WBwZVj(Af)m+)MksBqy6@n8M94NLYF-4ZfV*?u9VjS`kt!pgVeK
zaQot06KGy^K`8!e2#ob=+r@H}N=HtVeqARaVY5iZ8`p1~=`k`2(Qf&NoD?7l(#GY_
zfJb<p!~*s66;;_YW)$6b>5dMCbOy>M22{*ewvGsR1vU769tf62TGEF!UY;1A%kg>X
zE@7Z%O|$T}JAkX;s_iF(-2%oIetTk#>N$;Po<t<qqh@_O?-|0To`>q`{~k2oV(q&D
zyyumg#FG!3(-}@Gp*v6`a;p03EE_2q*{~U2sX4_H{_<AF_u$v?G2I2P`h)&}6Acxa
z<x)%6TPAk=Q}UxF$;e%SM^`F-j+t>yek)BPZD^5JzwR7nK4pIUn9E!yJz~Q}$$qR$
zIrN0@Ea{fz^@hn!*fL2(XHWcrFBz#iLG9rIVRJH<oI))XG-~pTFBkKjuW&9A3&T0)
z!-F^ap(!LQgU%9gzE|9-TuON)v6pIcvW5^Y+-&By7G#GvWEr~B(-jVx%C!$`a&r26
z%p|f^KFZCpnVJ$B_odY`%RS>;9SF@cV5eI$lvU^G=_wS8hw;&wWkD34=<rg|r{@W5
z_SP^K`1dmk%;?;-sSn&=IN$q`G8Ug2qzqeYLqJ0**<%$1IK%h}?Ly5A^ax1AQ}(KI
z@5+ZLA1n+qr7`@vEpbm~Kvwf%NJ0RS+s(A}$x+oP=f+&$(I2$7Qv-oOb0{Od#X?vA
z>)_n&xv++#C$N;U)ewetx=WYRlR`t`BkW?EbM0z(ZtxnrrzahHj7Tih&gr1Qj(xu}
zM<zyV6Q%am!MyGY7ZMSjcb?;=Z=6Q#ByRsAwRxFIQ>7JP2U!(J`5ux#VRo@XF8nQg
zw!YVaPM0D)?B)A`!dK$c@iT4{&x(o;n3dBVGJ=BNIJ?3qk>!-98BG?YE{kntpiOXT
z&1Qc~S1DK4JE_%j%lsN(C5=tp4Z`0Ob`oiq8F+&qwh*;H=b3hk3T(VbF}qs7^r4>Z
zfz1Oer}SU}{bq~B&2~gMbLEYAh(ya5h$44QE<e5QXhvCeC)r*Gq7h<f+6Gzoyc72G
zNi=Y<;q4_@bp74$9Tq2waboP@5r<tsl@#uFc3EKD=#L-kLY`8`i;WrQQY!L}N_ZEF
zNmEz-AZ;HEhBOYc4Wvg5hqB7cT!|S+1a8Ik(}CZA(`&UXH%uYtSHAlx%UIGY&0$$G
zdn~5iipP^NDP!)Na_`a@w`Cz=Ie*WX5Z5r1rJLk$*x10?pzedj{2s$SYuXexRKv=2
zrp5wW^32R5khi-uDj1BQOL{(7NNpR|H!a{cQm$vHSFf=z=s^O@r=vX7SW1&z)k8Q#
zyi^Sy)zLq$zM?ar@m&}sIC3|s=ckM5)R4s6tDRosKT?0?O@MCvzrMZ$o~!Tw-+I5V
zy~*A)J0m37imalnj3RqwMC5H`B_whqr24dFrW7S9ZK0t^MxiA%71jUTb1!f2e&5Hx
z$H(LIzUTQmuk$*u*XzuC?s=`*Fqj=v;1M`~nZq_f&R}E@g_P>$cWV9xcc-~>@oT$&
z^6|ifw=3&Dk{F_AUgS&~g(ig72X_vUp7YhoKR4XlpCY!+R<Ki%aecbw3`w6}(42Jj
zWCw3ELt^uxm^3yc{qOsRJ~hUg<a5}FC*QvB_^xqI{QU59t}lCkf9H(k4Mb|5xP3Kh
zp6}v}d~NZGDSi_rAv3k_QS5aohLuh2!yC{c%NFy{y56bate3}co!`It{nu3k?Uy9=
zhq^ZeXa!~XZaPzb<jdGx#d*ync>%XxR@v~f^^|@ezcaaK{LFqEIKKbha>jX2Xuv=@
za(T9euJyTS#^H)Rhs#q3s;}EU8`axvDo~wqqMPn%9Z$_3CDnAw`8u)iOo2$c_rqGQ
zca^U2kVpF8Ip%z+P&!K2=ggS3W5-c)-(^P|j+*ngE_uBEqF=nfpkdSS!0pKLuIP;`
zURyjqWmxR+{IN^+t<K6#uQzfgx-%ZRxjTNuw^>Af)v$<IMfw4Dxez<K59{S*-uH`8
z4tIM;ykF)-;r3@I4+y(bZkfJie>0-7R=*^`S~EqHj-Ku;+4WKDiByBWz@*@tlm@b>
zkL+(2*~kPAZjLgkG;P+84-)vx`JXy=DR4aTqv%eCME&TE+WchYkcFRp=>1$<-e+Dm
zlLnU=t&Sou?6?{fS2O=Eh$}@5MlW{xUX<Yc`d5Dc{@QPv48Ew;up326d+wpu*Fz7`
z!w*pHlCb7rkw$mU8r|v;YnIGdj`7<gtF}FJkA7wtU6S3XRPgp!tn&P=-k%{S=XE`1
z2lhF5RNa!wcu-JutRm&hrl$6{XSWU=+9Wi<IiaC8Gj{xSfyX+7<-*L?E{|?7?K{jC
z*^^-q$-wG3Z87xUCgyIZP<P7FI`O^vE35)%3kq&K@UZ<=V?IMlid5_Dj@9HbCi%bh
zXB*yC{xj&!Hql)lIrdH5dK;_$z_@swXiYOypR=q7pPl{v_4X<~1-0gGPd?~AULj&r
zV=30BIr+W$Let3$AMAoYtPd(qeBY-oHPs;?w)I#^BsV|l-N%UIA0ry;D2$XZUX_~O
z@-g=|g<k9k*e8~KJ(PW`y8qQ?#=Si2)~#A^96Y{(E0MD5VxllhN8Zozk{z$R1QC~j
zE1h}lp7fvIDwu!CXSyfOKgPM<oTYe`uucB4m$!}u?yRLdC1oPbczv$!>Kf4$?E`c_
z<mf&frTcMR?ZR!kSFD%Lw;PHEJ-4M$KCQhy=k~SgLHsG1S3$zl#;KD<SBI|_{ah<H
zRiW^zrI%$8z1~tVI*9B%yysO1-FTtj-Ya~@mqfmA`<ue@&8FDGWls2sg;?D6n0=~4
zmcp7luRH38w|`uzH8<j=GM<=tJ4rM3r_`;a?zErRBo0m4`CJ>iDb}&_>#Pvpshyb|
z6tA>W7x~(hft9)BgmpI0zS2J&s2whyUT)k*mL1{9q?AkFytzi9>!**<jn-Qw+0ELT
z2hx#U{iBY%-iV(ZFbK_QMG{xGo5zoj)lE7NUsU3aaEi)_I5{<{cc?;c@buPK4Rqhj
zQm#fa@vZW8AP>jyGETGGVx-01$#UsXig5wO0eopQ^Eim-qVs=;gTm8od%s=V*7HH{
z+ZDU3;YM+i4o~L}t$W0`{_on8Yk15ZdWB@HW}AnV8#6^8-8{<e9ki-=HNux)zu!it
zbgvM5y~DN_CIiRU&%27P$<(g&A3c&j5v6*0aM>S5>RJ#x3^|@AT6z*3vbM&)2(bR=
zCD+2$OhI9hG@Bk9@hh9wfn<C=cw+O<M84a?$(#FF6E5F8vwwdIpQhE;RJtI|ZV|@z
zCwf`!>e6<uwz;jYz4uyF(%)4a=>5;G_iHADw2rc!LofHL%;E#y@xQ)Ky_M{FBYkv=
zvhUdeuBg)6&pv)!sXf#>G$*b-cSNJs3#sEg(pks5d-)EhH``8|o9e`|TYk;0)aJ;G
zbcv5WlzCt;_|Ajn=Zp|J%8a>9zAPeleAV)6qUK_|V`n9<d1pxu`}fRiS_vp-d=%)J
zSK7OA>r8=5t4PQ3w|oyn%s%t=%saPUQ!i<y936cq^uA}=tw%S%s0plD#+oes{qKpr
z-e+c;((Wjn^GWdFXA<2Mqs-j&TzF&q1HE%TamAlkpKKg@d)J9KqVcg+&HYH#nNMuy
zUbSP(1A`hXs*|7SJa$_h5nyBR`03!Q3t<y+Z$bxpwmcTD>pdAhmTPde(XiXC<kE(h
z|M_GV-lgmlcCNcNBC+dXT0lbjHeEdyQ5nmQk^N~+T-UrzD^>}1e6@eH_D7Sb<<O|x
z<jKB}fbT;2g)3J-KKiZE_SU|U($`gwx(*pcr-gc%4>)bR-W_cveQxKje3v^m&Gag=
zZ!2_8N?rUN-><r>WQz~eZ!6QS-Z|M{wxeV27LPrZo>x+&vjjqmFJ7^%|C&v=^FiFN
zm`7TyHHCuFF~?VI8S)koP5WhdyK8J$;9E|X81@oYhOV;5-YY8Ff9D5XbgSv}oziOX
z^V@0e(ckr9b!Nq-6>;kxaea^EyL3q9@~-~4^?Dim<elDcNWHfC!eG9WYFUhHLgRse
zv6!PJbEose61P}U?Bjdy-LcPR7iGQhN6S_qH2HLefJMfpdgb5lj8?CdN|1?yg5T|<
zf%8Asu&3B@NmO_+hYT?Nw{gSq(M!wi8^zA(ANO%Tbx=*n>+aEY9b98w%BiJ73>)Q6
zs)y{7(f^^fi~r;4gJB!bAdM<cL%ktmE6xim3^bJ83-OEW=6&2j*>v)SZ)=x<bBO)*
zNvFEV-aF5F3uX6ha69GgcRs-BJ4f~C^G%GmEBNg?C%Cd#*q>+plNj*m@a@%&!+U$R
zu9a+No4s0Ig3f4_41C`qVt?z!kAznj?2SV#TqZBr+V{Wo&0+U)p3`@iZ{E=D*m(L%
z_1wwHdiH(1-Tz7F6sHB8qU^IxZE)|Hs$19LR=zRHt7D+KYD8T6a`uqQb4}f3-PYV6
z{ME^hB`kq?nQNF;19UujUH@eN(4AkWL+SJudib>3KSnfNCf04U&b$C+TU5{VPS0o4
z^nZ?yi0YpnF+cj6RoyXqLx;7{R^RjD2ShTX>{Vx7JD6*Nn=>7B{7gzHWfI5qwZs!D
z17{U$iuTWKdQ<ysT7!O!+@&0t{C2KuQ1$Z82IaLbJdO^P(GPoy+=t|Edbp8PvQ}zr
zer>C&A?9ML^7_T}p8ElIU$dGyOJCV{9MsK1R@in+M0uAEI5xg|>X0VCv(Dq=jg)us
z$n1@V6YihBC-sPyM=JIYMn9pfPqb61oG`9wbEv)@`7my1cgUwGou3AEO$`=)E%y(*
z_7507w+YMp6IY`4{KCHSSTnIVuY->l980R)SO4;(hA=}?b<&`UN_9@#!N&6pyC+;O
zYD8a~r0;sx^0MIArdz&WL_6~f3^#as?c%tUo+>x>O-{#ozsBpqO<KD5@>X|Hcz@iH
ziWo7fXTCQ&Ki0%~rR<dJlSXUv?LE&e)vl6XSKf8?DJ`yfSejAYr;^HYa!)BKytK7e
zyJ^RE(t~7@_Zd?PN7j=S25;OIT^(-3><A&-&R)I1`{Z846{RE9<Dr{p>?SsjXus5F
zA7hMT;HT$N_RM}7+Vq*Jy4~Gaz~~|6(Tx<(`3U3mBndBJE>7tSJD5ibcnmn~uAM`>
zpTv`TL=P!gS#h(~wLWQ5j5uaoBcG+Yn_0Wd$8<$aRQ(!lgS1lmn1UM7cGYVvo~Ah=
z!fmptx3eR(wvR-~)fJz7vQ4|vg01p~m(DP_=BW9|a2fyDhk8?y<mZ=6zE&RHH&1Dh
zG?SWPuM`km&d<iUaud6!21~o&cD?)J<0zuCOTc?dKg{m=O}kHL)pjFchwC#YH_O|Q
zyhWe3loo9Nv)!@zU|Wf~WAF3MS8*S!dS2Sz-QZRnZSPWAE^acXdy|WEn>`X#X=`qt
z)6G1tte@9$Y^663XTOmBo_Do*g%)oVD9>)D=VX6<{JGP@Pl!$LEXy|q!T)&QGYgU<
z$z>lE-k!8I6RX+Vac%bdizog;>2>jpCmSE~CTXZ$T>H&wLve@tn|dzN*Xvf2zg|So
zUY;8DXCD?2D`KDAbI*Xq$Xadr=GE4B1$Q)aiU*!hRb{W4-nrMX&3?mnM+edVb$629
zPf~m|vImosiUTIkJm~i*Z9<RB7z@hI%L_(({~Y>B>UaLQIZA3;cs!}=#WjbxnI8GU
z{)dtpOvy|YUpLCReKXhP5bR7}pI-Oh<`DiZyh#QLmw7)$9U!;nzlcvam{(|=J#Q1Z
zG2qsd|K!rp1l0o;OmZ>Xf2ry4ep0$q!8`m#pW;kDb@Q|p)4J{c^M%r?TVsswy^XJy
zRc3hoD>E|E+|SF;YgVR=?`T3{lYifbGt#Q|r_JN%+231Im>tTkRpp&k-`VFB$`9tT
z=<4n}F{mhe@5Dggt?IK*=NxZ;S6v;?sU1}*Jg4{ND}(8^4zX)%mk-I$O%>kw@?h-8
ziS`d~2Pot+l?TqG(Y^14TczxPxBj`h_Wt%!x<2vmzb~;L9f)T-%bM=BvFEtV!%e=g
z2Gi_&CJxQ43I3tH%XGudmO~Cbs=K7jUZhO5g`8Hjbm%;?b)82X<9&bk*#E+hspzJW
zGxiT`<cmHR6dEp1N{so*y3WT)Ip_;1ZDo%w>wERVKNKA|yTd1Xog^E+Zt>+$vXIFX
z3hL0mA?gQC`*tV_9E)q9lbCtzTV?hnMN;;d;#(HSKGRa6u^4XuYpTK=zb`W<r#6i>
zw`H6XUVB6<f#md<VMU480b{kS-6cO&D@#=Ej@5{h{(vv-7e0i<w#9qauMYeUUQ;A8
z(V?cy<Yi0WQ!LDc)-Bl-CuTv!3~1v(_+u093XY(POu=18yLYs;?m=9+r&H4Q+h_#u
z58B{)V_Q?b^(U)~eS=#z=gn%$NzBq2vuee$Mv0in1U8`t+KF8c0)Gtr(D0@oHZY1D
zE@8YR-rPYM?wyO98?JlYZ}>61S@NQ=YRm2@nRvMa`x7_amkV9t`rJ9EUZ#EvkH2er
z3wv;j=&SMY`-5lOSChNES~RmAnNoMYQ4yH5un8h-h}85-Ps#q0E^ygz8Q3gr8M(gt
z0;AWJCrQu!>t;D83t0`#a)s1_JBE)b^J(}8NvY=NJf&Q6*uDPze=*|C4qEh9@#@=~
zwA{9;yB5-?AAHUJZP-NiO7HX4PkE$Q1g`Y-zSXMetjc(BCcc|*Q<=^^_8$kW+z*%t
zHnd6&&;9)6l&fR8JV5D?oA69|iJ>9IlhsFa;;tr--ebA%Kih74{Z72(?I5Qwz>@B8
zqVr<n?yq5A9-W{JpSg9@QQ&2jaiQ_&l9fj5&v^ZCKDqm4A&+j<d6ykWW{kTUw@rVZ
z`glB4f%&adrN;jDM&;#x*DJe|?hW@S36JI|3sSE6{L#xAQu3#)e(!dLNuX?5U^TcI
z<gJnIkt+<GFPaXlwvOBV!25hJS6YIZAam)_T2_;8|Fq?GYaI`&d)mJ4@^}4N@x^Au
zGvnMFqx71di<^|rKNhR3>B!sK_H)U68aUCVtGOgO`~z5BN`3xAa1t(n9^8UPf`{ku
zdr48TV$w7`na6dI#Eu_ylPDp*#m}a(RFQ~JrrsYVY2c{XagrN5%n@HpBEEJits||%
z(Y|^TepTY7krvW7Jnh9*k~#iMvW=9EA2mF2n?!sIReuLNV22&L>%U7P&R<@AOd7`1
zs-BWm@w|_ok@|3{&J1IR6TutOOM@dMejNQeO8SbUA3l;s@wDzwU@rt79pt~TmXyv;
zM|T2zWu-2(c*7?@<)M2*lJipm<CUdj4~<#;66Ac99UIplvU&Pms@O&3@XbJ13yX3;
ziMzvo3SEhe7U!OA@(dm{b*}bssg^mGL6;L7bnaqY?Zu1k=lkVMR(iBt>5cxhJ7WCd
z^!|~yU+G`ER!^)Ny85F$@lj&Oqh)I(cCpgg`*^J^XVSRrqtLp3l(Jba*=|&Tw@rG+
zgSYlTeBRBewXOD}9K3CcGYUDE%BL@ircEDUqEt;}i{>5Y-PaS{#)Q00*l$EB9(K@~
zZDgVxo$!{A&#I&p4NrYd+MGt|{&IwOKDY93$?%%5^R-M<JzsXS7*|bX@g`Y3Dv;OT
z<3Q%!cIS~zd3AB8-b*nG_%vR>^zmIevZ>3u+sAYKZQS!t9kBHfT;X#{ds=O+yo*}d
zlM+il;ai-eYdWjsB(^!ex}tYQUBup^X!VG_nz+OF2V13%99$PXW9;wdnYUBEIN`3J
zO>Xeovnv9_C+)vwv>ZEgEnf8?%MXs2qt=rSeorEGa@jO;wtCvKUk>f3n6%xHa&~sL
z4P`l|bx*gpvC%(jF1X*qJj6&~Q=fI>uHp+U)tM9DZVznGlJ6<B|E3ZYM)&&Thrl9s
zG1<f{uJHcUpbz#cPIjehQp%5Sju01@5D^yHIxILY-@I;p`5jZMT*Vt~J$sG3QpE>8
zUw>Y)Q`Yw6n(cM_!UlEYKG?TYWFDm5QW3MtUj1s>q-k`s?!iwiwJyb<Ds|rl9%(Q>
zcunf%k-b?5IR<TRwEnd8tJ)`j{N{wv;IAitLTb!Tew#V;?8Bi|=Cxwao0?0cZa!bV
zS-f>h&y#PZs*_$If81DSkN8|*ZqDhm>W{zFQvwIxJ}uBxvfKVE@;nl^+OVNOkD_%k
zL6P_Ssn>(qXZds9<_2FK`8iXWVY4zkt>lf6@GI@OM@5ISon@X$U(fIPFlD997_f8s
z8Rd0(fjhmm^kQD$nQofPsy+Vl)PY~~V>h&~ysk;V6rr=}t-fyMzL4lhr*9nhBZt`P
z4zV+wpZTx1^4*6Gz4QD%!gjH*FXxZG>#V1QUkJJyWt5+H`D^CfhWhnpP948{QoCL`
zQ-u2X`^Y!Mx2`>P+`7koy1Sq@qR#NUM2yBAiDlk#a_>FDnMxnAWT-x@<N%Lma%B!;
zj2qDGh6D~5{(X<OsSD%}oLS3%Y~o7)p}FbaZq}|lg17AatPG5{R(<JrssCy4Eo<uP
z2*tHQD0Jh6SI*V4Hn-h6!qc_SB$RIaqP;VCx9@0vkg?3lF;}%a^=0?re@C`8N!>nM
zxJ~!)>!07ADI1SBm7P6Wb`Ja}9i&{C=(%r)uR_^%)lG*~qOJPePk0=D8p#<q<D7it
z*%sH{;%Ddnn<4jZIb=2IIVxE5t68h>&phSEL2ah>bXR%Gq;JT%?wE84xGT({U?P$G
z;*B61zyIgAA^fr<y{pPT^;-Waw=LH4+3`WJ9@!X_xBAd}USy_og4e4ixAfbyQ;(_(
zZq`I!wI7P@8W#8>()8_J(e~S!9^R>IKJ;;1vsdfiZR&C1$WHB~Q?G5yMYii)&gNu1
zd)0~3v{}dEW4@Z}hx|tOe!&r6lflAGPu4R`D32YCE8YA4?zzhQ&PonmmSR?a#H}t4
zj<@dm%p1tZ5-s#Ds&s|)Slr}_u<pUqd;hf@d^|d@_kNilxx#msyx?z^o_sYj*OfiX
z!khN8v!4{3451rIW;Fiw{2F7yQ0_pEa_~;WR}O0_tpTzfm&BhpMZ|nLc>I#5@#nAk
z^>%ZdFX#3z+a>)e<AvsJw%m0WuD|mNls{i_fwQ-y$klYKe2$CUrjDOpZ)JFnkBD4f
z>F(m2TX7^uacj)x)w|T+zpj7bHNG`m<3G9|V=Q)hXY~izmL0eoaOkvO;QDkM9tlo8
z*4#KdWa52pCxzX|y3njBp){&B-$Z}hvU6saNa8mw0r4==eQu3S*01S=#gE>NXNrs|
zwC`|W$k)i!m>Cm780^sfck@(7J*&nxY)k(&WAfPFZ!3pab7}Fftsd3OzF$|+cxkp(
zV|b-SU7gzKK*izd;+W4<BeRyH>Fqp|Q=1ROZz)srPO(;^Jg;VG?I|h9&QhLzn#`Mg
zVmBv)CcS;;M#qBTogOR?ZnVX>M$RXQZ5|C&fB%L55Eq+|^x0fzeU9_FjY3?;vA36X
zrz(DqyuGZaCs?2-Ge7QJwsv<<Vc!0z7==HpZ8Pj$8@NkE>g;vYFQrvfAge_4RH}U@
z-n4g_zP3?$emQ|s7v0l*k2TIq;-ity=+#wXf)CRzd!GA~K6ItW9@pBgd*%SLvAemG
z^;r?}p<VX+>C!6C-0Pag!p4(%i7BhQ9Bz=5#9!*u^D13spxeFwjrZ(x9!|DbB>7cr
zX{S8M-hslN?n0gs!uwWt$~@mB1a6(IcIyh&V6XHQF0U_t;Y1NiYW1HsykA<8(XQxD
zuDt}dPtqOg*<bkxe_YO9876E5eyFoo1_&n=`q!P(j4$-p{2rF;6X6?~>pv}D(thp6
zu-^S)TQzi2gWdS?irE$ShfRE^H{2iA=orgB=JWoh{A`S#-el&1&Kr?Y$|@uaE=4<?
zsakI34pVN#yNNQcs#X?VUmC47(aNCb9@W2hoPUa?qA?@dE9k0yVo&+`@z{$yy3SSi
zy;CY{9Bl21>q=<)W>{ev9e1ejMY}<5{dn=-anJB^&n|<u?GN8AFN@A7jV4XBJ}Y~?
zMQ6fBd%~vcXKaYQLr?j+2j%DVCt@S73Y@wWXg@Rl%wThL7e%z%U^ie^YS5xTk@qa|
z$FhgQ+Ec4L4I&!G+4&z{?tE}LGx}9|Sa5`FdD;(7^T=BgN-7$Xd!q8vH6<j+1k7sX
zuG+kPnl6PpaPQ)H5t89${XNI*h{gB2W=G6^o!Vo3@N1CS5&K`KGLpsKeKU)Ys<b+~
zvQUC|m$vVA=GE(eQ34#<Z_GSf$Gtl~;v(1UzLq;j!$gb~eeYa2*@?7=54`%S`k<BZ
z<B5U8m8qp+(tdwcB{#74M}3;%@%X|vTp0Gq{Dt1M-u;WF`t2spRv)DgaK5k?y8XrR
z8b?yYmbgPEPk92e|C3wABKJ<}lxnGoF3;xd|2*P&?wn8eY#3lVn@fo|le^lGW#T2i
zr;J5Md6cd2>wRN}pRxNLz8^N(D3i*4w@OUP(GelNsbbO5-5>~VjX-%$dm;z#jwy71
zz0=HncjmJ`LtdZh>o+qB-BE>mx$oLsPBS@Zc-pK+CsjnoMf$+g9RjImV;v8AhB4?`
zzTv*h(y+dY#c*wj;vtiVg_JVxyY81WO_~f(Th-{M-YC4neK%)^c&fttD#L_h^bKLR
z8#e|Udc?+De13OyUT7J6)5A!WUn({Xb)+zPO^%4+ut1dztMA4y^UF8{8~a8$pM31@
z^h!N{+CZxP`;Cgz2GS2JQzEJq+U-6HHnZt23-#@5A3S~8cfb6I#1o@wIm(BOM5iw|
zLaIrh%pW2V^`vRLC-bwhD>yz`t6dihl`%?j-*1;?J}njOU(NC=J?!+s#>XQr@ytz8
z)r?-55l8hZPx!1f+UHKXe|_6DbMV1XzVD5br(Nn-O;3JN3Vs?YIlc`EUXdt5sW8gy
zXZlY5lld~ookO&J2rW3i$z#J_%9?eRCg*Ezl60rTo+#W<U*Gq;`(v>&QyX6#h3TNZ
z(9JcxbIfNm-v4TI%-eoh`0$Cm<i8&{4kf#8+}X6T@3~iZ!u$1;eU)KtaYlTX#`~uP
zUnT#zVce4}9?j#Gnf1PRxO!t)W5VMz99{2kmB^9~Urgm2c$G8pX#9Mq73YhSi4?hD
ziyJQD_0j0+4-KL<W!dR1Vs2<h<WtM?mtzmElxK!)uozWW{&0Z3uQ)rm#nTPFA8D7@
zeEEJw>}8I=ui05GMsDcsNbzMeJJ6LMK8w_3W*4+1xuK6DbuH&#jy<|EpLx!Jceuvn
znSiF}$lCoaX>ObMw*;$c7)tE+624kYIq`9;P@3=8ffsZ}IqodYrR1TJWxJPqusF=*
z8fQJsIQ7%gI~AQ0PVUhi&kXo!*+%~=b?S5OA5E{TQ!}}L#40nVzU2N<@cKP5Yx$RM
z&6gvma=Vt#?EK9Z)AM3x_RBajf9%qY^|R7#Z&y2#G<q#h-FNw={zSqookL^Uw)g|7
zlzQ{#=9kTT*adu6vXeVYB6@u}i`24IFTD2&xMq-bDe|p!uWzMiagzgAjGIApy>-lo
zkx#O-(d<X|bgwhA&U_P}&(M3O^+@);dU5ene82L^526G~PlJA2`b0mtbu9L?Nz}C1
zUoED$8<}$R?>yWQs`bml|2A*&;SYy8Y~KDoqnsi+v#h6}@vp@!-|%0h*^RTpoQ^*Y
z=FKv^mu?7PU#YF0C(XfC(yHGiK74KD^oKNpf3Bp<OumVy&9jif?HSl=N|cSPiQlbb
zFG?20*Gr*dWO^Kp6esuNdF>R*Pw+H3WwH$ZYu$3P41Uo|xB>YI8~oPG(vl257{fS6
zT9Ju0*%52<4Sdz*=R}soKc~ywK>iEKvNw_kS(vf+I!P6mrP0Djk_2(7KgXrxTga98
z1sG2g+Y2ATkDdsS8QtYgo`FS%`;bHNTUG{xu_Cc0AA2a74PV}ggpp_PDsb*3zb2M}
z@nm9YsI-gBhF^-JmqZ2^pkRXE-AyjQFX!>dAcx@m?q-tr?Zr^kl?SPXKUjGY7+MT9
z<we$Dg`(-ahz2GR+Qf^%*jZ?;0Jt86nGcbMIaK)oA;u$|53zth>P-RO&4)+aLT5z5
zlMp{54>1#d#1#G*6avXd_z@NOG-V5(-tr?b!T{=pJ?RS|iV$0~9z5+908(J3fWqPR
zI_M_>qBy`(6m=9t6d*po7CaRTA}}x-8YK*#UJD}XR7_(TfkD2>%Lu-O@__RGGDHv7
z6;?q~h^WF<j7xwJ0>g5l+~VM=K?qTTJV8CI;15V-DohZ8g4Zo1uZ2J8twA<f5ujd7
znMc=wr&tjLMmj@%mxHJKB7}Ym6~L2(C;~$&piq=JQ9_h@DS%xQMKmE7pj#8j9OzyY
zbr3_8;S<zBi5RFSRuq(XOpK5hJelKJltGp#aRf#&LxB}V(Hr839K@h;m?VI4Fa|3m
zkkv4GhXi5`Q^K*leG)`o_@pEWo-luLv;$azBm#qa;7?r(Pq+@G2p5Z30Vrdo5E!Kn
z1vRsU%pn62>7@)JuqTW;y#~l~QyN(X<$+J)GQ<;9X`Bq9(s~)hm0A}?S)wk`(IRDm
zqhU3JPuH<0j5%}xZaLrrn4`fbKkNykgmr9|19ilnU{NgcL{ZR@yyb~z0`fUQB8)+a
z0>}?}V>WeGAZ!XO>;emcb!Ac{>gr?zh};wj2ZyboQITi`gNlToL77dJh^7Lc3bCif
z8jL6{t%0sG@dRpM56gtY_bUV8v8uopqPZNj5bOy!qT|93QS{Mr;E@<#Xek*LU@43U
zJ|!$XK|OV=5PE_pky9m10-5htr7{;q@2Ucx7#DgqP}Cyx2sOeDAoI?JC&*k}ou~q2
z9;FVLLk3ubx~EPwD1dFklQ9>G)c`~ob8b!W)TIHsC@c$ja)&>lrn5DHrm^JPnusS<
z4V2eZYpJ|>T12aaZFCrWS`=D)1yyKgs?&_DSSqisHlYmILF8+L4q{RI7upNbV|7u{
z0Z$lnXrbLYgnPlK#|uwT3}xK~p>zpHg3O=jE@dvMx0HDl_O!^nLvJZ_;gy6lK;{uE
z2@An~=*CLmvzWk8HzN9oAl!}@z`wqAw54a@X9OQ6gOdvw5ypUlTe2ush#!*SQKL{T
zGlU;9f%rx$4g*}F(h7*cqE;D7s4$UzzZwFgPC?IO82mrDi44FO+AM>d)MD{CdvL`c
z3{(kw4~9T0Ot3e#MPLLZtP2ulsFy0Dmy$t^^$~ah8SKFrreI=`qa+Ku$_(G+#Q_~@
zNR5TLLd&E<7EHyMpE4vYB5Y{68o>-AH!ws4wU;3nVFqSklfjEML_p+71A-iMVxkOA
ziwL|{43<k@j#e2V%h4)Bg0j{S5v3o&6TcZEd{En1B7>SNdejI}hVihVh*CgAH?SYR
z_;1DHFK)U?(*!C#F1Qph?Ei=UE<w-LKw?AJ%MkKl?T$ehxUvzVh5k|jUnKm?MTe%;
z?U2+AS`q6{8Jgva3gx81n;}{U!#V_pZxDk)xKIN#qC^a#H$dr4Kuj$VjSGFS8UUCz
zFgK>(y#R=ym1;om&|5Iz)&jr*V|Ah4${-ttVqG%>hXRm78D-NZ60v@RVFQ+^iT+)%
zA2zBnlq&$Q6NC}G(A{eYnV`8}EkPcwAxr}iMMY{JEVdV_VM53Z)ff3MtXU0$kS_WX
zq`A73#sq=k-cTqdtI`5<q5o|FEgAzjFOrL+Rq8}_vAGAsaSY+dUmUzQC2EFEF&GAx
zAXv~a)X)q>dBv0mVG-qpj9e%Sh$#rI0eb+qMT8%%P$Tj{q<j&<<B6df<^+t5bPPif
zh9Sg~%?Tl)p(K}MWi7-O<B<YF(D<wvO=bNcHP%Ccn1&VvA8d$cs9b_XVDZGlY2cwH
zFbp@=hQXMZVN%dbq3za)0L~Y}AQ~B5hv2aP5*S1zgE7TW%zNn1E+V{WizOitHWbo-
zTtt?k4z>gW?V_!URk`Tea%N~>YSRf>0Jv};#SDUt5A>(e>uV9I|I?<R1g{~6MKHtr
z4(QbKYH0gfL=uZt#s_N&yQ%<cDuNzTBWeht^Egz*rpkf$Z&=yTuwNjeh}udKb-<b>
zgPuB806r6eK9j7Dbr}*c`k2u=K#GkjkoDCiNR<y6!COAYAHs|p3mG}la%s@QF{8kS
zux=575zt@^QyeKGkZCnus<fEa83q^gz#wQ#Gz|Mx(E1mp#A2l3mcc~DCT$Fnn$Yp3
z)*~buWn;o(!zjavMFMto7&9s+EOhXZMMR8hP-!j54+K^dhKbNNUW<uXv^4}bHOA)^
z=ss6gfz}-z;~NvSO=D>n3M8Ou7F;yV;+7VwX@|gTEb;E|vsRIorpj_^7yNI2Bbxjx
zR{(NlbUzOwP-0J*nadv3w{S&~DFYw6#vYM}EtBunmScwCDo+t`GpzC=3p%?0Qblwz
z%A!zhA+&aZ#Wjq@;gyiZCwnkfV|rwB0EsINVB#tVg0DvJ1%pX&QOH+thLYO7VSL+G
zLCQ)#&`Wtag2;PPhCHZ#3^6VpJu_5X2d<Q~16Ks=(a1ArNs~_i<#I&$;aJx1Js9c-
z@??QL)UgaJ>+d?6Jc_W&f>{@Znn0D8gDR`i6wzcyCBN>7NJ8>opIexGz=gy5z(R^N
z<QE(<@*>wjPE^VX$by-qulvR1MnK&J-t#KaP`ho0)aP85p~+5!N%EY4>OOBN((;r;
zyA~1$u|%tFP!x_0hy-kS>Kj1fhQOl2?Mg5^EUZ64U^Ev@`CLGsDo;}wIhYWQA5Cxs
zs>MV*o;+2a4(e<TK69i_G%z(iiGkF)NdiTyqS;k(HwA{nufui=pE}KG1@tQk^s7!&
z%&A>OMxG+p1a?>ybcw=^Kw5)j0+gl#GZ@g91_9+%KB{mD7flOy1Ec%|m;S2Ilo7WF
zQr}4vLGzpmy_GuyHbz+x$j=a<@}I^4&Rn2S2~@>}*cWkd0g2Oj7&S_9L1duQY~8S-
zeH!RaP6~JeO@VZUXuAtBDWAu(>X)NO`4MqcZxbQ{^C~d(sYQXCiT{FIaA@<&9fPDr
zDOFr(`6fczbDIE@!Sgs`P_2S;Zzd4Q%>c=+!`ZuSCYBO~SnB0VKwcpbpI(t#?RgCF
zZy^BwqVCH?%fZaM+e+_>948%JspP+YdcOnY;0G}YS<xz2VywI33Rvm%LO^qn1DyrW
z&`bPog)vnEBea0Vt52hscP|#Gi`G3CM#J2QN+h`fR)eny&>Wp!0RCb?^#}%_n(oBf
zE8HC<a!nA_q@sW^PSh3jFR*Z$K#DYl|9%T|I8F#seP->@pK0v2Clzo)NrQ&^?tIY<
z6CWxe2>KWY4`6XjK|6F$->3y{d=xZKSsL<@-)Nx+q6Mk$Fo%a(fL8JW_y%p8>Y+!S
zwt(B3et8h8Iw$!v(E<3Z22dAmU*(G6q~0Vj5ef5LP?RUA`W(w5#D;P()AOU<7><ot
zLjb2gjyi5Zgwa3V2rG7zJRfv8v)4ygzXh$2jfaj-fkyO0JQzD2NJYJ0{$CHcDU25i
zx!wj`VJjWn0_3R^#i2{W^nB?15W)}-vZcxQL5KHF?cXldb2;kdg_uEIz5640dlqO@
z1ze_XNF!E)Ax0&K?$f6iLZ`e41^n>>1>QBqAX(Jdo7e{n@&>7Y?C=a{y%8~}jJsH>
zhs&beFuFA=;R8~wH{+@HF7&);PB0<z?;js`{{X_60<rCAg!$x+7WyC_u+CE$1IGX?
z!5FpiMR;MVw=YPI4Z~8UOSXc!=DrYmE__hJJcskbf&CYO=VSvDtfFDPGio6Zz6YtY
z6)?(-T}b3Y<F^tk-a-s{nm|QfZAAp27H>{=qN{)ltpP2LI*Mcc@>uc$xd6Iu8(6pl
zVNjoKfYGjWh@h3*5J{-6>mZfB0@d<c@SVTgfbU?!51-sIiV3d8_ixWyl85WDB9~qO
z_4Xr-6z&K32OPwq@FJiGOvSK}b_}|4e9<PX;MRZKL8<rs|Lb}ePEg5F7eEgy5#kRx
z9Xo|X;QoJnJ>80>vezzVU_pQR6Bgpy4xouP90K?GbD_Vl(l0}Uw-Zt)V7N~Qj@N((
zSj+<~_314<6+{XUz}*E~02estcej9!gADAdNMqBn2a5u*qJ9B{#Jd6jtFf*{0i<D*
zqlOarSGi-oI4KA&Ab^So5@M<b0xl`9aVTqqo(CT#u-2c7L9b?U=wcuu46RpU{8>%_
zh&ciNv}wfb`n@O%7b+M8h9=C~)EEW-R!iqEPQMVfKoHVrc${5x4)C1>f1s@|{`)WW
z5(C;E0=hd)*#{poFr!Lff&weu(O<Pa4>;^4;IOpwf%A-b9-&}j`+7|<s8l91o|;Ey
zAPj&>dQR7BbraaEN&$Tu?KEtF7pH$1O!VB{5pCCHK%cw`OsZ%L>=(sJ6+=LQm=^6r
zK!Ize@l*#%h9w;YHNe8Zs$o>b=<!!7KQRW=8aM;>P|!zVY~4aZYVQg>H9r)=XOfN9
zOr>=|34@?%(N6XpSK*{U*%HtbIl}-0D@#1p&K%4{&V&-`ydM@TBFX{gWpZFPvS<LT
z{R`UR^y0P*oK(-H26Fg!${y{G(}U0sc(1@24ody)ji)ksfl{$a2{dARzGyoGFrpAB
znRf83NX6*+P{&gY9B4I#fd>_fATmupb+vN<4MrRcj<g-&$BZSJ{)U6sADG%yB0%}Y
zIZL3x2tu^I81xhbej<uuMQ?%>=#!M-!iXcFCocp&Iqh7~^zagTyHW;jC>ktkRV3i2
zd~69G8%Yc>RTyM{28X&M5mjiBzgTL<xg{A=8W@<+)ltYYC`HQ2uC;2QuF60XTBn<<
zqs_#Ea@R7jqHCiFEm6Z-{5w62xj>tfiz+|c4j|6f%ZoUIf`}IqsLu|f=ZL`Yqt}+;
zXIqzgcbLG6v_T;5Bdn{Z@gm`_C7HOFF_KZG2fz~s;(@qWLwx($=b;|R^%8gjZBENx
z+MH~tTQ~5;#hlHKs~+Zq3D8C0N3;vCdoTXY`Kk{%66`{-GBp!b9XY^YXOi{rTIB4@
ze{){zX8_wLVT803f_=LUK|K?J#I&mzF!Gru;(iN)&o5&Xq0TFprIW!XEgjt$n5gK|
zD5p>i&or#Z$c`QnVH85=z)}=?6l*NdxRl%yTwMml_!ufCBzd{BwV@Yu%YT71CNxZ6
z=`Uu|K(E&l^kP~O#kT;R8OXDehMsd3PR|YAzoA=B0D91P+-{D2pZx&n%mF>Ec9o1U
zdNEYn5LEJT9N{5n<AA*Wt8plD6{8^f6F`vF8PfrswSWzFmS2;m=qn~T{Vn4Kddxg$
z`zs_AFvEhX(fYol8BTv>CjxG^0i@IrDF3p)VS$m#p!D%zN(V?$sdyk@fE8p=q{&Q1
zz2gyS$RuOuoVp$8;2A&%Z$Kkom@Sn&c^#uLbUw)KJ;sg4i3%$xfUX5A$2I{VPd7pY
z9d-g0D@!1BbOwXMH&HWDoEf>P4t?)Qh{9K(BYxn}w0>gmg|jo+MZ5(J-UT=v^ubfB
zyg(ryyAXCsOeJwYls;?)Tvh-L(rWJ{YLW;RlJtp$@~8n_{-tyd!#Lyb*HaQfQQbT7
zq6T6a`O$}oM15Xj&`<&f@fAH{W=7xbWaLA0k_fy1>e_7G1nTk^3{tc%w4Va=phG!;
zJ|PJagMRW~J82M`L&t(KnYJrH_bimbjh;yZI)i0kwGH|fG5-gY;llRs^mQ<Iu?!VR
z51W<mZXmL5A(fqV0V59%W5#R8;I$=G*u5Au%Ei(g{n%W-15eTC{CC#y<M2WrX4EH{
z*t|*h-WXU3$aO*AM!Qm9d5ngf3B8s~%tHH<fdt~GA&g3%1nQQc5M6>A1wif>@SL11
z2<k^6-iJ{zWW#kl6Nra{dtwikn$m%%f>1UHn$r&SEt*1@Z+Qy9t$T6YL>#PEx26!s
zGxlOo;oxFcUi3i<u{8PsAbOywR73$)OGN~s>7Hn9S+N{A-5mI%HQmwSB}}qYi9L)@
zx&;cbX8}%1+Z&0DE}>T+2KApyCFEsI141>tUV?+rJorR4K67MN8kGG3{LxNSlgAe6
zWzZ{W1gpCktLgDY2q{S?rb^Q30Ga$iMKGmtp#JH^0w@W?>pv~QuY3d!i76F!CaeY#
z-Lb-Sbn{?MPV4j$?5NWo@Y<BL2T_Ge+izYP`W5tXOkh4kI|tQMz)10PANhMgfiYm+
zy9eP%+x8Hv?Lec_k<*~E>L5RDg<W(ONk!3<83->F%lv6WXEmT-3Fv8e3+(k4>3Pwz
z3}VNxB?ByC?Dd(@9!bz;c<3<+qU@Q3@<cNM=4py!MdEA-8o7o^01X2}6WqW~#qdP4
zMVt-2ok_UlI}A!ThmaDgk%h=hW34#!I$iWmAe}If&YY$P_Ov5J2(o2Tgrk`>Hagv~
z`~33(AoKy5Xs3cY4nzjVY~rYgRyHWp&5^0diCqcZnGGbtcE?Mx)C@N)RT`~yWkS%Q
zY@%~z$pKKF`yvE3Q9#w8pgGF=lj)#4V-^Ru=g|my$pfdq<Hn=}M`<`1Ok%96{F%@w
ze<o%0@-`+}SO<7P`mS(p>qjX43GmK4H2_jrz~L8GaO>~r7uld7JFv+|J7(4gGNDJe
zGij+U-6+L$0;4wpne2g1Xic2817;D!0y-(;wa*1|9gilGK@=x(bUK$X?_Uh7j3KbI
zJAlmCtOItRA^QNfI~m7{%DI@)^ZO7PDDmYaz6a5uXm(&jQySG&QV3q`dBk}e(>%Z?
zGL;E!uV9iwQz#&u6t*Cd28MC_rNN(C1M*LSKNA{0Jx5>$Q*^EbVTUTz3JpZ=qb6s7
z3J0qosEE4f6RW?}d{79}F`^I<RZ1J)Oa8s+82>I*>MY1Jb`A%NQg}E}lLBJd5Ly88
zb)H{@n9*0~m_(pypiKub{A&$Uk+cRsnsS+m2?bH7I8n*{gpSnr1AMjt$9?t_4Js8&
zO=?-pB?uQo(5a|lss6R~&6i9?zI<Y6cRy%fP(xU2LC4GFZv)NzUqgSK!096k2|Je+
zf>M!pcxuWxFf*n*tQsW;FyuXfOe`1~8w5i!==~QAT8>^gfXG3;?YHsax{F5b1A1%w
zhGBB3$rsQqU^7PO01u?vY6HNM`ak}E{cq?y6PkJuyg#HAA#%8pvG4()3h%(5F^!SS
z{t~nf#b75){5Nn7Ok~($a{C#GVy%7)a5LJys$+DhZxy&#p8Gcw2fC>kk%iuxR1CV#
zJM<7*2ta^>00g2`hyH|-)Ux5ZO;o`I9{2$nH9kme)E_*VZPN{k3<gE6p%FBn1Lw;v
zz=@td2*yop$=Q7nuxsH&ok|d?q9FkUHD)LA;41;FiBf|a{9Az%AuNv#Y@C%PfXNlG
zX<7mTp@Dz~!l*+v(KcC809_Tq`Bw|Fp%y|UqBfZ2k}&uLc;5+%N7tw$%tdRKkx+FR
zk{IlEp!?2XG-+UfS)f7n4iVCO9RkpKMGO)|t27aAR6`!bA!s`UO2_)lE)3tGxdi{D
z4o)i!sF5V8MiLY>lkWnWN(36C?IJ_9XmiS;1(-8pdTT8OoU2wW!T**LuY(QC0Ce1F
z5fVbx3`zJ<0JFAWc%JbRe3=oD#{mcpohCR~=A1H^fJMvy>z4P{piYMo3phSfV>kS3
z8EddNd>B(F5y(Lno|~z?8y$e{T>W1M4z*vT$Cvuy<v_q_2bfy4UxW?)wSKA1hB4UP
z4bLQAf#^c1u_zG#+wTlL7D<`0z!1XJH5)ZL#J_Wo08iAk5;Q;%CPEhS{~X{ad<V$y
z3amuCdA>3LBV7v(zONF<wmA?>P{4vk$U$8($KKwQ3dW{9@Z!&mrcHPS;l;ezPLhXh
z3?6;195Ee4hnf&UhBeU;FRBq^M$aBWRAI+59{OOa3-vvQ2r!7oQt`?i;2Yh=<)~#_
z2Ko?mF7E~Yt(rv~)(*{}Rf4xMJD&y;O@Kez4q_Vxqmo32cLRrgS4HgCaUTWs^G{iX
z#NkK}D+$9_{Le~er9%25V+k0{LII9Mx{n(_??i{2KqW$Qaeg3d1#{6O2@?7x8`v9L
zh(mw%I0nkJ%v+?9qE?b7z6Fh9Bl9u;#?R6T{_lVnsAdd!3yh7R)H{>^?OeAWqOuXg
z+5GQYl+hW`1wcok-WB|>O7E0XnJuGXM*Suq^(h83bgb*c?zqLTxTT}Bps8EXVJaU{
zoX`Kf^cKBdj)+6sEZ&g>MjC4xUZH2Gyd-d53pWM)duI|Vod?)qqAj^+;GaHzX9Ja;
z2rav%7Z0G0Cx}{p9OX^H_P`$T{@bkXfpuFY*d!V<Kv=-}K?G$#4rZcQ-=}^YIK)gV
z6-MDHLhw;Kc+I&mr!L2c#IDg2$)LZF6JEvsAHY@Gmf#L0Bzz(Y>$sD1d{;bZ>vmvv
zW=o?o!Mlr@c+j#e@Zt{yvJ$5H>m0`U$Gs&)vd4fwV=WVkA9@1d$`3Gq7Aa{UaiPw~
zNz&+@y`cNWoN=i9+o?uS;2ijKq$xP#IW<pRElC-lnqV67ISE*vd_e;v==qai?-YYy
zV(^>(1=yH6n){pr$fq|82v<>;3<qkr6P)hSY$e(t)W&G75_caE1_c^%q7iC*d}(H8
zRQMW6hT1^iY>Zs133?%Z;CQsJr&Zr#`GkwOWx+e&HlV+&r-6R3LG!_BAXCFMgwe<|
z;N6jwF*v?Ae48Xlt+C-5Ky+<pkw_c*x$lEcMhfVInm|WuMI+|KXKHb*_rP!nXXw}z
zK;$gobZ;K#<aib_hJ$_~mU{lrVk$TK{3(f;(*l*2oCEMn@QMZ-__-%Z+$cDph@fnJ
zATkj4dK{`f5+k|@ULe;Y{3WBHidW7d%FxD6k5Qx+$oCEW+0e-Oo^^p-AD_fv_VcO+
zjOf8?7%(d0RuD(4tBLc<FEM0RU;*Jpr6x)E9wwAv%Xt6~E~CO#=MimaQ0nCd|88Xo
zfq4`tXYsxRDJXHSWzV;>K+-YrN4r*<kYA*i!zVRBt8OKaQ(|rc+I7HTXjk=PU?xTI
z=R(84cS+PCgxyB1VJ|SB5ilR^Xfy}rSc^g>{Q)kvxUc)*6kiQC+58K3MrbFTLty#@
zGA*2KB%|TjohWcz!3_VX7AWVW_5uxlo`9EEAni4Hk+B@CA!+xkZ-H%sI>ZEyz&;_b
zSnr_HnPBjmwLt6Zz!wIX=l-e#90jeg1bMVd3={?zUYI`Se`j@4&?zj3h&9GY0tE*d
z+0fJV#0FA#J;?jR5r>i*z}^yH1M!WIX#;?|HY`H;mp^B*)Gr&cRDq(l<={BaauBX+
zv3A^z02bOth3y-OmtzSSG8MjnfXxU?vH(8)!z7LV)mS?OESCm!N~-~pNNOIg3t(;o
zeACT`H$yiX*h~PdyJ-!*E((=yMnsCPtB}x#)<79K7l;|A&L-{S_dpT<cP_=5xR8e(
z9k_tVU}`OC0`h7mEdbnT+Xgb&<RX@3XfOt^*u4Ogz!6F|w7!Y>s;M7Cd9xN#ba*Yo
zfy!Pab}sBL0{Bxl4Gg~}TQZX>TU9wOzzW`ciu~)9LVK}{vM4xJDT;UCm;$?k#qA$~
z+JyoI($4m>ig9|b5VADx^;n1Ra9>ynTiRjkciMse;=x6F1buM{QGy!R9pK^F2Q;n)
zwp3_4kDDbJJ^uAhQZuMoa}~}29JN%1t^paW&(}@r0fi+10WHD*7ykX1T6t`do*7+p
z88{5)*1?wnt6p%90BeEZY$i8)?lK|;yU8vL8U|+u2#6hJy8^6+H80I80E#|^L*N7^
z2O55b7>_D2hy)G}V7VYPa0RSDv9jn}uv~ShL<=~8^hg^VBep}7u!E7pXhjPGKQBaU
i0SzO=Dk>%`=x9p<``{qdHvMb*S+E(>unNp6=>8v{?Fyy<

delta 31358
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
Z(-3!>a9<ncdd~iweIOj!6L*MW_dj?ucyj;%

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 f6232fb..d1c315e 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
@@ -1,5 +1,6 @@
 org/jeecg/common/api/dto/LogDTO.class
 org/jeecg/common/util/SpringContextUtils.class
+org/jeecg/modules/shcoolFloor/service/impl/ShcoolFloorServiceImpl.class
 org/jeecg/config/mybatis/TenantContext.class
 org/jeecg/config/WebMvcConfiguration.class
 org/jeecg/common/util/MyClassLoader.class
@@ -145,7 +146,9 @@ org/jeecg/modules/atComplaintReason/mapper/AtComplaintReasonMapper.class
 org/jeecg/common/system/query/QueryRuleEnum.class
 org/jeecg/modules/cheerConf/service/ICheerConfService.class
 org/jeecg/common/aspect/annotation/OnlineAuth.class
+org/jeecg/modules/shcoolFloor/controller/ShcoolFloorController.class
 org/jeecg/common/util/RestDesformUtil.class
+org/jeecg/modules/shcoolFloor/service/IShcoolFloorService.class
 org/jeecg/common/system/vo/DictModelMany.class
 org/jeecg/modules/cheerRecharge/controller/CheerRechargeController.class
 org/jeecg/modules/payShop/mapper/PayShopMapper.class
@@ -225,6 +228,7 @@ org/jeecg/common/util/dynamic/db/DbTypeUtils.class
 org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.class
 org/jeecg/modules/shcoolSub/mapper/ShcoolSubMapper.class
 org/jeecg/common/api/CommonAPI.class
+org/jeecg/modules/shcoolFloor/mapper/ShcoolFloorMapper.class
 org/jeecg/modules/payOrder/service/impl/PayOrderServiceImpl.class
 org/jeecg/config/AutoPoiConfig.class
 org/jeecg/modules/payOrder/entity/PayOrder.class
@@ -232,6 +236,7 @@ org/jeecg/common/aspect/AutoLogAspect.class
 org/jeecg/config/sign/interceptor/SignAuthConfiguration.class
 org/jeecg/common/util/dynamic/db/FreemarkerParseFactory.class
 org/jeecg/common/util/RestUtil.class
+org/jeecg/modules/shcoolFloor/entity/ShcoolFloor.class
 org/jeecg/common/util/PasswordUtil.class
 org/jeecg/config/Swagger2Config$1.class
 org/jeecg/modules/atPromotion/entity/AtPromotion.class
diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index a0970e7..7cb059a 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -79,6 +79,7 @@
 /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java
 /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MyClassLoader.java
 /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/service/JeecgService.java
+/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/service/impl/ShcoolFloorServiceImpl.java
 /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/MatchTypeEnum.java
 /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java
 /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBoot401Exception.java
@@ -111,6 +112,8 @@
 /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/JeecgCloudCondition.java
 /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/thirdapp/ThirdAppTypeConfig.java
 /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidConfig.java
+/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/entity/ShcoolFloor.java
+/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/service/IShcoolFloorService.java
 /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/service/impl/PayShopServiceImpl.java
 /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/service/impl/AtMasterPieceServiceImpl.java
 /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/controller/AtMasterPieceController.java
@@ -216,6 +219,7 @@
 /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java
 /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateDTO.java
 /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHanBanner/mapper/HanHaiBannerMapper.java
+/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/mapper/ShcoolFloorMapper.java
 /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintReason/controller/AtComplaintReasonController.java
 /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/Dict.java
 /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java
@@ -229,6 +233,7 @@
 /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/mapper/CheerWaterMapper.java
 /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java
 /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/controller/AtActorCollectionController.java
+/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/controller/ShcoolFloorController.java
 /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/Md5Util.java
 /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/controller/CheerRechargeController.java
 /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleEnum.java
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 c5100ea852b2ad42f79c708b72f61da7eeef371c..19c26eecafab3c29448b1a77e02d0c288fae8d54 100644
GIT binary patch
delta 708
zcmY+>PbdUY90%}uGdpM_WK&uqtiwi&^)HsqzZ4E@{aYfDotfR)9V`D19Gsn2@5F&P
zIEgeDMUh;T5|=$lL_|s494PktCgt?`{(irCGxOfNe<1e{B*oJqn9LlP#Bl}fh07_0
zLY#_S@RS>eCJ`GfCB<-rltD_I@Ql>KM7|ul_-Z)ISHc~>0zUG!@LedSULgZ{`!}yS
z6Y08OHtI&>ndZN_WJ*UKA^G$oBL4qnx?{3qdTnZgd7>|_J}=gb2nXgYd`pkzbn@sF
z<sAzMF9jb2;l^f9Krk0?v5sD{$%4=E#a8u~TUbYPe&T2KKtrbmtM<JyA^rEG1HMCB
zROLA?S>!ku-5?ekb*9qkNVb04H)FhJ;Ervzc6=|sn7)m(<FWbOsAazcuK3yUUHV<9
z)1*e&BeA1dl{!#AOKjsMavSP7xfLGCEigf8hg|_H)s!0KZ^cSal`1258T0PH*-3!S
z(j+U*3>Km94zlZ82zpUp1{LU12jPn9fv@T)^n}>_Ak>RGBRmYJ!b9*X%+@(HTo_%_
bRP;Z!F*rOCg69(wtc=KTJ#q}kCKrDIFb>Bw

delta 708
zcmaF#nDNnLM&1B#W)?061`Y;>;ta)!yeiBf%49ur5s-Q&527Y>Fsg!S14bP%9nWY8
zrYAERgXxou)?k{Q$p}o_FqwntGA2_ny^hHQOh09^0@ELu4JHRM3xnBffb4n3?33p+
zb3yrzP&LkQ`7{<mFgu=6Y4Z63R#YcXUdN&Za`WWdEKXorfi(i8dUG|aEi0I@n@bXG
z*XHZ8K1^T{HH8DrV8%=3kBnf(T~#eMFoR2H8AN2W?ji^yLjMm$SGbV~L?qAn2iUQj
zGwpmtz`Aw>U1t^qS{fO#M|DCr69WSeD+7bg<b{kPlP4JSPcA8t*?d2&6lzT51Bh3x
zQZ|Ae{4T`=Osl5agAALTo~jR~XQo1e?_#PAm@km#2&O~QAVD)L%^S>rk>&)Zb<^F!
zba}cfnBJf60;btAyufr|ru5{z3=1&(Z-(^bBN=8;b|6$f7%q1x6Cx*&COug!OAYKk
z`z$LkU6U0ArY~k?fYsY%M}g^?*#ThsO?D!f4#<JX@6HJY^M!L`!E|wM44A%@3(=>a
o2ad4GU3uAH@gI3fU^+HG2TY&IPXp7Y1?gaVe!&4SomAKW0C585wg3PC

diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/cheeroncontroller/CheerInfoController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/cheeroncontroller/CheerInfoController.java
deleted file mode 100644
index cf06211..0000000
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/cheeroncontroller/CheerInfoController.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package org.jeecg.modules.api.cheeroncontroller;
-
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.apiBean.OrderPayBean;
-import org.jeecg.modules.apiBean.OrderRechargeBean;
-import org.jeecg.modules.apiBean.OrderWaterPageBean;
-import org.jeecg.modules.apiUtils.printUtil;
-import org.jeecg.modules.apiservice.InfoApiService;
-import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-
-@Api(tags="加油小程序-个人中心相关接口")
-@RestController
-@RequestMapping("/cheer/info")
-@Slf4j
-public class CheerInfoController {
-
-    //获取个人中心接口
-    @Resource
-    private InfoApiService infoApiService;
-
-
-    //获取个人信息接口
-    @ApiOperation(value="小程序-获取个人信息接口", notes="小程序-获取个人信息接口")
-    @GetMapping("/getInfo")
-    public Result<?> getInfo(@RequestHeader("X-Access-Token") String token)
-    {
-        return infoApiService.getInfo(token);
-    }
-
-
-    //修改个人信息接口
-    @ApiOperation(value="小程序-修改个人信息接口", notes="小程序-修改个人信息接口")
-    @PostMapping("/updateInfo")
-    public Result<?> updateInfo(@RequestHeader("X-Access-Token") String token, HanHaiMember bean)
-    {
-        return infoApiService.updateInfo(token,bean);
-    }
-
-
-    /********************************************************************************************/
-    /**************************************加油小程序相关*****************************************/
-    //获取加油流水订单
-    @ApiOperation(value="小程序-获取加油流水订单", notes="小程序-获取加油流水订单")
-    @GetMapping("/getOrderWaterPage")
-    public Result<?> getOrderWaterPage(@RequestHeader("X-Access-Token") String token, OrderWaterPageBean bean)
-    {
-        return infoApiService.getOrderWaterPage(token,bean);
-    }
-
-    //获取加油流水订单
-    @ApiOperation(value="小程序-用户输入支付创建支付订单并且支付", notes="小程序-用户输入支付创建支付订单并且支付")
-    @GetMapping("/createOrderPay")
-    public Result<?> createOrderPay(@RequestHeader("X-Access-Token") String token, OrderPayBean bean){
-        return infoApiService.createOrderPay(token, bean);
-    }
-
-    //获取充值套餐列表
-    @ApiOperation(value="小程序-获取充值套餐列表", notes="小程序-获取充值套餐列表")
-    @RequestMapping(value = "/getRechargePage", method = {RequestMethod.GET})
-    public Result<?> getRechargePage(OrderRechargeBean bean){
-
-        return infoApiService.getRechargePage(bean);
-    }
-
-    //获取配置信息：折扣、客户电话、客户微信
-    @ApiOperation(value="小程序-获取配置信息：折扣、客户电话、客户微信等", notes="小程序-获取配置信息：折扣、客户电话、客户微信等")
-    @RequestMapping(value = "/getConfig", method = {RequestMethod.GET})
-    public Result<?> getConfig(String keyValue){
-        return infoApiService.getConfig(keyValue);
-    }
-
-
-    //打印账单
-    @ApiOperation(value="小程序-打印账单", notes="小程序-打印账单")
-    @RequestMapping(value = "/printBill", method = {RequestMethod.GET})
-    public static Result<?> printBill(){
-        //拼接打印信息
-        String content = printUtil.spellMessage();
-
-        //客户要求打印两次
-        printUtil.printBill(content);
-        printUtil.printBill(content);
-
-        return Result.OK("打印成功");
-    }
-
-
-    //支付回调
-    @PostMapping("/notify")
-    public Object createNotify(@RequestBody String requestBody){
-        return infoApiService.createNotify(requestBody);
-    }
-
-}
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/cheeroncontroller/CheerLoginApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/cheeroncontroller/CheerLoginApiController.java
deleted file mode 100644
index 260f991..0000000
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/cheeroncontroller/CheerLoginApiController.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.jeecg.modules.api.cheeroncontroller;
-
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.apiservice.LoginApiService;
-import org.jeecg.modules.bean.LoginReq;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-@Api(tags="加油小程序-登录相关接口")
-@RestController
-@RequestMapping("/cheer/login")
-@Slf4j
-public class CheerLoginApiController {
-
-    //授权登录
-    @Resource
-    private LoginApiService loginApiService;
-
-
-    //小程序授权登录
-    @ApiOperation(value="小程序-登录接口", notes="小程序-登录接口")
-    @GetMapping("/login")
-    public Result<?> login(LoginReq loginReq){
-        return loginApiService.login(loginReq);
-    }
-
-
-    //获取用户协议
-    @ApiOperation(value="小程序-获取用户协议", notes="小程序-获取用户协议")
-    @GetMapping("/getUserAgreement")
-    public Result<?> getUserAgreement(){
-        return loginApiService.getUserAgreement();
-    }
-
-
-    //获取隐私政策
-    @ApiOperation(value="小程序-获取隐私政策", notes="小程序-获取隐私政策")
-    @GetMapping("/getPrivacyPolicy")
-    public Result<?> getPrivacyPolicy(){
-        return loginApiService.getPrivacyPolicy();
-    }
-
-}
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/LoginApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/LoginApiController.java
index 19ee009..997d74d 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/LoginApiController.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/LoginApiController.java
@@ -48,28 +48,5 @@ public class LoginApiController {
         return loginApiService.getPrivacyPolicy();
     }
 
-    //获取联系电话
-    @ApiOperation(value="小程序-获取联系电话", notes="小程序-获取联系电话")
-    @GetMapping("/getPhone")
-    public Result<?> getPhone(){
-        return loginApiService.getPhone();
-    }
-
-    //获取联系微信
-    @ApiOperation(value="小程序-获取联系微信", notes="小程序-获取联系微信")
-    @GetMapping("/getWechat")
-    public Result<?> getWechat(){
-        return loginApiService.getWechat();
-    }
-
-    //或者折扣
-    @ApiOperation(value="小程序-获取折扣", notes="小程序-获取折扣")
-    @GetMapping("/getDiscount")
-    public Result<?> getDiscount(){
-        return loginApiService.getDiscount();
-    }
-
-
-
 
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/payController/PayApiIndexController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/payController/PayApiIndexController.java
deleted file mode 100644
index f00695e..0000000
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/payController/PayApiIndexController.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.jeecg.modules.api.payController;
-
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jboss.jandex.Index;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.apiservice.IndexApiService;
-import org.jeecg.modules.apiservice.InfoApiService;
-import org.jeecg.modules.bean.WaterPageBean;
-import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-
-@Api(tags="知识付费小程序-接口部分")
-@RestController
-@RequestMapping("/pay-api/info")
-@Slf4j
-public class PayApiIndexController {
-
-
-    //获取个人中心接口
-    @Resource
-    private InfoApiService infoApiService;
-
-    //获取首页接口
-
-    @Resource
-    private IndexApiService indexApiService;
-
-    //获取个人信息接口
-    @ApiOperation(value="小程序-获取个人信息接口", notes="小程序-获取个人信息接口")
-    @GetMapping("/getInfo")
-    public Result<?> getInfo(@RequestHeader("X-Access-Token") String token)
-    {
-        System.out.println("没有劲来"+token);
-
-        return infoApiService.getInfo(token);
-    }
-
-
-    //修改个人信息接口
-    @ApiOperation(value="小程序-修改个人信息接口", notes="小程序-修改个人信息接口")
-    @PostMapping("/updateInfo")
-    public Result<?> updateInfo(@RequestHeader("X-Access-Token") String token, HanHaiMember bean)
-    {
-        return infoApiService.updateInfo(token,bean);
-    }
-
-
-    //获取商品信息
-    @ApiOperation(value="小程序-获取商品信息", notes="小程序-获取商品信息")
-    @GetMapping("/getPayShopOne")
-    public Result<?> getPayShopOne(){
-        return indexApiService.getPayShopOne();
-    }
-
-    //获取订单列表
-    @ApiOperation(value="小程序-获取订单列表", notes="小程序-获取订单列表")
-    @GetMapping("/getPayOrderPage")
-    public Result<?> getPayOrderPage(@RequestHeader("X-Access-Token") String token, WaterPageBean bean){
-        return indexApiService.getPayOrderPage(token,bean);
-    }
-
-
-    //创建支付订单
-    @ApiOperation(value="小程序-创建支付订单", notes="小程序-创建支付订单")
-    @PostMapping("/createPayOrder")
-    public Result<?> createPayOrder(@RequestHeader("X-Access-Token") String token,String shopId,Integer num){
-        return indexApiService.createPayOrder(token,shopId,num);
-    }
-
-
-    //支付回调
-    @PostMapping("/notify")
-    public Object createNotify(@RequestBody String requestBody){
-        return indexApiService.createNotify(requestBody);
-    }
-
-
-
-}
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/payController/PayLoginController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/payController/PayLoginController.java
deleted file mode 100644
index cc9d632..0000000
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/payController/PayLoginController.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.jeecg.modules.api.payController;
-
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.apiservice.LoginApiService;
-import org.jeecg.modules.bean.LoginReq;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-@Api(tags="知识付费小程序-登录相关接口")
-@RestController
-@RequestMapping("/pay-api/login")
-@Slf4j
-public class PayLoginController {
-
-
-    //授权登录
-    @Resource
-    private LoginApiService loginApiService;
-
-
-    //小程序授权登录
-    @ApiOperation(value="小程序-登录接口", notes="小程序-登录接口")
-    @GetMapping("/login")
-    public Result<?> login(LoginReq loginReq){
-        return loginApiService.login(loginReq);
-    }
-
-
-    //获取用户协议
-    @ApiOperation(value="小程序-获取用户协议", notes="小程序-获取用户协议")
-    @GetMapping("/getUserAgreement")
-    public Result<?> getUserAgreement(){
-        return loginApiService.getUserAgreement();
-    }
-
-
-    //获取隐私政策
-    @ApiOperation(value="小程序-获取隐私政策", notes="小程序-获取隐私政策")
-    @GetMapping("/getPrivacyPolicy")
-    public Result<?> getPrivacyPolicy(){
-        return loginApiService.getPrivacyPolicy();
-    }
-
-}
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/schoolcontroller/SchoolApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/schoolcontroller/SchoolApiController.java
deleted file mode 100644
index 2a2e337..0000000
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/schoolcontroller/SchoolApiController.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.jeecg.modules.api.schoolcontroller;
-
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.apiservice.IndexApiService;
-import org.jeecg.modules.bean.WaterPageBean;
-import org.jeecg.modules.shcoolSub.entity.ShcoolSub;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-@Api(tags="报修小程序-报修相关接口")
-@RestController
-@RequestMapping("/school-api")
-@Slf4j
-public class SchoolApiController {
-
-
-    //获取首页接口
-
-    @Resource
-    private IndexApiService indexApiService;
-
-
-    //增加报修单
-    @ApiOperation(value="小程序-增加报修单", notes="小程序-增加报修单")
-    @GetMapping("/addSchoolOrder")
-    public Result<?> addSchoolOrder(ShcoolSub bean){
-        return indexApiService.addSchoolOrder(bean);
-    }
-
-    //驳回
-    @ApiOperation(value="小程序-驳回", notes="小程序-驳回")
-    @GetMapping("/editSchoolOrderError")
-    public Result<?> editSchoolOrderError(ShcoolSub bean){
-        return indexApiService.editSchoolOrderError(bean);
-    }
-
-    //结单
-    @ApiOperation(value="小程序-结单", notes="小程序-结单")
-    @GetMapping("/editSchoolOrderSuccess")
-    public Result<?> editSchoolOrderSuccess(ShcoolSub bean){
-        return indexApiService.editSchoolOrderSuccess(bean);
-    }
-
-
-    //列表
-    @ApiOperation(value="小程序-报修列表", notes="小程序-报修列表")
-    @GetMapping("/getSchoolOrderPage")
-    public Result<?> getSchoolOrderPage(String state, WaterPageBean bean){
-        return indexApiService.getSchoolOrderPage(state,bean);
-    }
-
-    //获取楼栋
-    @ApiOperation(value="小程序-获取楼栋", notes="小程序-获取楼栋")
-    @GetMapping("/getFloorList")
-    public Result<?> getFloorList(){
-        return indexApiService.getFloorList();
-    }
-
-
-    //获取室号
-    @ApiOperation(value="小程序-获取楼栋", notes="小程序-获取楼栋")
-    @GetMapping("/getActorGoList")
-    public Result<?> getActorGoList(String id){
-        return indexApiService.getRoomList(id);
-    }
-
-
-
-
-}
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/schoolcontroller/SchoolLoginController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/schoolcontroller/SchoolLoginController.java
deleted file mode 100644
index 4b79a44..0000000
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/schoolcontroller/SchoolLoginController.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.jeecg.modules.api.schoolcontroller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.apiservice.LoginApiService;
-import org.jeecg.modules.bean.LoginReq;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-
-@Api(tags="小程序-学校报修登录相关接口")
-@RestController
-@RequestMapping("/school/login")
-@Slf4j
-public class SchoolLoginController {
-
-
-    //授权登录
-    @Resource
-    private LoginApiService loginApiService;
-
-
-    //小程序授权登录
-    @ApiOperation(value="小程序-登录接口", notes="小程序-登录接口")
-    @GetMapping("/login")
-    public Result<?> login(LoginReq loginReq){
-        return loginApiService.login(loginReq);
-    }
-
-
-    //获取用户协议
-    @ApiOperation(value="小程序-获取用户协议", notes="小程序-获取用户协议")
-    @GetMapping("/getUserAgreement")
-    public Result<?> getUserAgreement(){
-        return loginApiService.getUserAgreement();
-    }
-
-
-    //获取隐私政策
-    @ApiOperation(value="小程序-获取隐私政策", notes="小程序-获取隐私政策")
-    @GetMapping("/getPrivacyPolicy")
-    public Result<?> getPrivacyPolicy(){
-        return loginApiService.getPrivacyPolicy();
-    }
-
-
-
-
-
-
-
-
-}
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/IndexApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/IndexApiService.java
index 1bc8a07..d8a6c82 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/IndexApiService.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/IndexApiService.java
@@ -2,10 +2,8 @@ package org.jeecg.modules.apiservice;
 
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.apiBean.ActorSetPageBean;
-import org.jeecg.modules.apiBean.OrderPayBean;
 import org.jeecg.modules.apiBean.TrendsBean;
 import org.jeecg.modules.bean.WaterPageBean;
-import org.jeecg.modules.shcoolSub.entity.ShcoolSub;
 
 public interface IndexApiService {
 
@@ -34,43 +32,5 @@ public interface IndexApiService {
     //获取投诉原因
     Result<?> getComplaintReason();
 
-    //获取商品信息
-    Result<?> getPayShopOne();
-
-    //获取订单列表
-    Result<?> getPayOrderPage(String token, WaterPageBean bean);
-
-
-    //创建支付订单
-    Result<?> createPayOrder(String token, String shopId,Integer num);
-
-
-
-
-    //增加报修单
-    Result<?> addSchoolOrder(ShcoolSub bean);
-
-    //驳回
-    Result<?> editSchoolOrderError(ShcoolSub bean);
-
-    //结单
-    Result<?> editSchoolOrderSuccess(ShcoolSub bean);
-
-
-    //列表
-    Result<?> getSchoolOrderPage(String state,WaterPageBean bean);
-
-
-    //支付回调
-    Object createNotify(String requestBody);
-
-
-    //获取楼栋
-    Result<?> getFloorList();
-
-
-    //获取室号
-    Result<?> getRoomList(String floorId);
-
 
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/InfoApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/InfoApiService.java
index 47e88d1..b68a433 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/InfoApiService.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/InfoApiService.java
@@ -55,22 +55,4 @@ public interface InfoApiService {
     //用户提现
     Result<?> withdraw(String token);
 
-
-    /********************************************************************************************/
-    /**************************************加油小程序相关*****************************************/
-    //加油小程序-获取订单流水信息
-    Result<?> getOrderWaterPage(String token,OrderWaterPageBean bean);
-    //加油小程序-用户输入支付创建支付订单并且支付
-    Result<?> createOrderPay(String token,OrderPayBean bean);
-
-
-    //获取充值套餐列表
-    Result<?> getRechargePage(OrderRechargeBean bean);
-
-    //获取配置信息：折扣、客户电话、客户微信
-    Result<?> getConfig(String keyValue);
-
-    //支付回调
-    Object createNotify(String requestBody);
-
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/LoginApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/LoginApiService.java
index dff059a..83522af 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/LoginApiService.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/LoginApiService.java
@@ -8,23 +8,10 @@ public interface LoginApiService {
     //小程序-登录接口
     Result<?> login(LoginReq loginReq);
 
-
     //获取用户协议
     Result<?> getUserAgreement();
 
     //获取隐私政策
     Result<?> getPrivacyPolicy();
 
-    //获取联系电话
-    Result<?> getPhone();
-
-    //获取联系微信
-    Result<?> getWechat();
-
-    //获取折扣
-    Result<?> getDiscount();
-
-    //获取套餐列表
-    Result<?> getPackageList();
-
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java
index 265ba15..8cd3bd8 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java
@@ -22,29 +22,15 @@ import org.jeecg.modules.atPromotion.service.IAtPromotionService;
 import org.jeecg.modules.atTrends.entity.AtTrends;
 import org.jeecg.modules.atTrends.service.IAtTrendsService;
 import org.jeecg.modules.bean.WaterPageBean;
-import org.jeecg.modules.cheerWater.entity.CheerWater;
-import org.jeecg.modules.cheerWater.service.ICheerWaterService;
-import org.jeecg.modules.hanHaiBank.service.IHanHaiBankService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
-import org.jeecg.modules.hanHaiWater.entity.HanHaiWater;
 import org.jeecg.modules.hanHanBanner.entity.HanHaiBanner;
 import org.jeecg.modules.hanHanBanner.service.IHanHaiBannerService;
 import org.jeecg.modules.pay.MpWxPayService;
-import org.jeecg.modules.payOrder.entity.PayOrder;
-import org.jeecg.modules.payOrder.service.IPayOrderService;
-import org.jeecg.modules.payShop.entity.PayShop;
-import org.jeecg.modules.payShop.service.IPayShopService;
-import org.jeecg.modules.shcoolFloor.entity.ShcoolFloor;
-import org.jeecg.modules.shcoolFloor.service.IShcoolFloorService;
-import org.jeecg.modules.shcoolSub.entity.ShcoolSub;
-import org.jeecg.modules.shcoolSub.service.IShcoolSubService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
 
 @Service
@@ -83,12 +69,6 @@ public class IndexApiServiceImpl implements IndexApiService {
     //支付接口
     @Autowired
     private MpWxPayService mpWxPayService;
-    //加油小程序
-    @Resource
-    private ICheerWaterService cheerWaterService;
-    //获取楼栋
-    @Resource
-    private IShcoolFloorService shcoolFloorService;
 
 
 
@@ -157,185 +137,4 @@ public class IndexApiServiceImpl implements IndexApiService {
     }
 
 
-
-
-    @Resource
-    private IPayShopService payShopService;
-    @Resource
-    private IPayOrderService payOrderService;
-
-
-        //获取商品信息
-    @Override
-    public Result<?> getPayShopOne(){
-        PayShop payShop = payShopService.list().get(0);
-        return Result.OK("查询成功",payShop);
-    }
-
-    //获取订单列表
-    @Override
-    public Result<?> getPayOrderPage(String token, WaterPageBean bean){
-        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        Page<PayOrder> page = new Page<PayOrder>(bean.getPageNo(), bean.getPageSize());
-        Page<PayOrder> pageList = payOrderService
-                .lambdaQuery()
-                .orderByDesc(PayOrder::getCreateTime)
-                .eq(PayOrder::getState,1)
-                .eq(PayOrder::getUserId,hanHaiMember.getId())
-                .page(page);
-        return Result.OK("订单列表",pageList);
-    }
-
-
-    //创建支付订单
-    @Override
-    public Result<?> createPayOrder(String token, String shopId,Integer num){
-        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        //判断商品标识不能为空
-        if(StringUtils.isBlank(shopId)){
-            return Result.error("商品标识不能为空");
-        }
-        //判断数量不能为空
-        if(num == null){
-            return Result.error("数量不能为空");
-        }
-        //判断数量不能为空
-        if(num < 1){
-            return Result.error("购买数量不能小于1");
-        }
-
-        //查询当前商品信息
-        PayShop byId = payShopService.getById(shopId);
-
-        //创建支付订单
-        PayOrder order = new PayOrder();
-        order.setCreateTime(new Date());
-        order.setPrice(byId.getPrice().multiply(new BigDecimal(num)));
-        order.setNum(num);
-        order.setUserId(hanHaiMember.getId());
-        order.setTitle(byId.getTitle()+"购买");
-        payOrderService.save(order);
-
-
-        //吊起微信支付
-        String s = new BigDecimal(0.01).multiply(new BigDecimal(100)).toString();
-        int i1 = Double.valueOf(s).intValue();
-        Object appOrder = mpWxPayService.createOrderPay(
-                "购买"+order.getTitle() ,
-                "127.0.0.1",
-                order.getId(),
-                i1,
-                order.getId(),
-                hanHaiMember.getAppletOpenid(),
-                order.toString());
-
-
-
-        return Result.OK("订单创建成功",appOrder);
-    }
-
-
-
-
-
-    @Resource
-    private IShcoolSubService shcoolSubService;
-
-    //增加报修单
-    @Override
-    public Result<?> addSchoolOrder(ShcoolSub bean){
-        shcoolSubService.save(bean);
-        return Result.OK("增加成功");
-    }
-
-    //驳回
-    @Override
-    public Result<?> editSchoolOrderError(ShcoolSub bean){
-        if(StringUtils.isBlank(bean.getId())){
-            return Result.error("订单标识不能为空");
-        }
-        shcoolSubService.updateById(bean);
-        return Result.OK("驳回成功");
-    }
-
-    //结单
-    @Override
-    public Result<?> editSchoolOrderSuccess(ShcoolSub bean){
-        if(StringUtils.isBlank(bean.getId())){
-            return Result.error("订单标识不能为空");
-        }
-        shcoolSubService.updateById(bean);
-        return Result.OK("结单成功");
-    }
-
-
-    //列表
-    @Override
-    public Result<?> getSchoolOrderPage(String state,WaterPageBean bean){
-        Page<ShcoolSub> page = new Page<ShcoolSub>(bean.getPageNo(), bean.getPageSize());
-        Page<ShcoolSub> pageList = shcoolSubService
-                .lambdaQuery()
-                .orderByDesc(ShcoolSub::getCreateTime)
-                .page(page);
-
-        if(StringUtils.isNotBlank(state)){
-            pageList = shcoolSubService
-                    .lambdaQuery()
-                    .orderByDesc(ShcoolSub::getCreateTime)
-                    .eq(ShcoolSub::getState,state)
-                    .page(page);
-        }
-        return Result.OK("订单列表",pageList);
-    }
-
-
-
-    //支付回调
-    @Override
-    public Object createNotify(String requestBody){
-        WxPayOrderNotifyResult notify = mpWxPayService.notify(requestBody);
-
-        String outTradeNo = notify.getOutTradeNo();
-
-        //开始处理业务逻辑
-        PayOrder  byId = payOrderService.getById(outTradeNo);
-
-        if(byId!=null){
-            if(byId.getState() != 1){
-                payOrderService.lambdaUpdate()
-                        .set(PayOrder::getState,1)
-                        .eq(PayOrder::getId,outTradeNo)
-                        .update();
-
-            }
-        }
-        return null;
-    }
-
-
-
-    //获取楼栋
-    @Override
-    public Result<?> getFloorList(){
-        List<ShcoolFloor> list = shcoolFloorService
-                .lambdaQuery()
-                .isNull(ShcoolFloor::getPid)
-                .orderByDesc(ShcoolFloor::getSort)
-                .list();
-        return Result.OK("楼栋列表",list);
-    }
-
-
-    //获取室号
-    @Override
-    public Result<?> getRoomList(String floorId){
-        List<ShcoolFloor> list = shcoolFloorService
-                .lambdaQuery()
-                .eq(ShcoolFloor::getPid, floorId)
-                .orderByDesc(ShcoolFloor::getSort)
-                .list();
-        return Result.OK("楼栋列表",list);
-    }
-
-
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java
index 4fe90c4..a1a5df0 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java
@@ -6,20 +6,11 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.apiBean.*;
-import org.jeecg.modules.apiUtils.printUtil;
 import org.jeecg.modules.apiservice.InfoApiService;
-import org.jeecg.modules.atPerformer.entity.AtPerformer;
-import org.jeecg.modules.atPerformer.service.IAtPerformerService;
 import org.jeecg.modules.atPromotion.entity.AtPromotion;
 import org.jeecg.modules.atPromotion.service.IAtPromotionService;
 import org.jeecg.modules.atTrends.entity.AtTrends;
 import org.jeecg.modules.atTrends.service.IAtTrendsService;
-import org.jeecg.modules.cheerConf.entity.CheerConf;
-import org.jeecg.modules.cheerConf.service.ICheerConfService;
-import org.jeecg.modules.cheerRecharge.entity.CheerRecharge;
-import org.jeecg.modules.cheerRecharge.service.ICheerRechargeService;
-import org.jeecg.modules.cheerWater.entity.CheerWater;
-import org.jeecg.modules.cheerWater.service.ICheerWaterService;
 import org.jeecg.modules.hanHaiBank.entity.HanHaiBank;
 import org.jeecg.modules.hanHaiBank.service.IHanHaiBankService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
@@ -71,16 +62,6 @@ public class InfoApiServiceImpl implements InfoApiService {
     private IAtTrendsService atTrendsService;
 
 
-
-
-
-    //加油小程序
-    @Resource
-    private ICheerWaterService cheerWaterService;
-    @Resource
-    private ICheerConfService cheerConfService;
-    @Resource
-    private ICheerRechargeService cheerRechargeService;
     //支付接口
     @Autowired
     private MpWxPayService mpWxPayService;
@@ -346,143 +327,4 @@ public class InfoApiServiceImpl implements InfoApiService {
     }
 
 
-
-
-
-    /********************************************************************************************/
-    /**************************************加油小程序相关*****************************************/
-
-    //加油小程序-获取订单流水信息
-    @Override
-    public Result<?> getOrderWaterPage(String token, OrderWaterPageBean bean){
-        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        Page<CheerWater> page = new Page<CheerWater>(bean.getPageNo(), bean.getPageSize());
-        Page<CheerWater> page1 = cheerWaterService.lambdaQuery()
-                .eq(CheerWater::getUserId, hanHaiMember.getId())
-                .eq(CheerWater::getState, "1")
-                .orderByDesc(CheerWater::getCreateTime)
-                .page(page);
-
-        return Result.OK("加油流水",page1);
-    }
-
-
-    //加油小程序-用户输入支付创建支付订单并且支付
-    @Override
-    public Result<?> createOrderPay(String token, OrderPayBean bean){
-        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        //判断输入金额是否为空
-        if(bean.getMoney() == null){
-            return Result.error("支付金额不能为空");
-        }
-        //查询当前折扣
-        CheerConf one = cheerConfService.lambdaQuery()
-                .eq(CheerConf::getKeyValue, "preferential")
-                .one();
-        //判断折扣是否为空
-        if(one == null){
-            return Result.error("当前没有折扣");
-        }
-        //得到折扣值转为BigDecimal类型
-        BigDecimal discount = new BigDecimal(one.getKeyCentent());
-        if(bean.getMoney().compareTo(new BigDecimal(0)) == 0){
-            return Result.error("支付金额不能为0");
-        }
-        if(bean.getMoney().compareTo(new BigDecimal(0)) == -1){
-            return Result.error("支付金额不能为负数");
-        }
-        BigDecimal oldMoney = bean.getMoney();
-        //支付金额乘折扣保留两位小数
-        BigDecimal money = bean.getMoney().multiply(discount).setScale(2, BigDecimal.ROUND_HALF_UP);
-
-        //创建订单流水
-        CheerWater cheerWater = new CheerWater();
-        cheerWater.setUserId(hanHaiMember.getId());
-        cheerWater.setOldPrice(oldMoney);
-        cheerWater.setPrice(money);
-        cheerWater.setState("0");
-        cheerWater.setCreateTime(new Date());
-        cheerWaterService.save(cheerWater);
-
-
-
-        //吊起微信支付
-        String s = bean.getMoney().multiply(new BigDecimal(100)).toString();
-        int i1 = Double.valueOf(s).intValue();
-        Object appOrder = mpWxPayService.createOrderGo(
-                "购买"+cheerWater.getName() ,
-                "127.0.0.1",
-                cheerWater.getId(),
-                i1,
-                cheerWater.getId(),
-                hanHaiMember.getAppletOpenid(),
-                cheerWater.toString());
-
-
-
-        return Result.OK("支付成功",appOrder);
-    }
-
-
-
-
-
-
-
-
-
-
-    //获取充值套餐列表
-    @Override
-    public Result<?> getRechargePage(OrderRechargeBean bean) {
-        Page<CheerRecharge> page = new Page<>(bean.getPageNo(),bean.getPageSize());
-        Page<CheerRecharge> page1 = cheerRechargeService
-                .lambdaQuery()
-                .orderByDesc(CheerRecharge::getCreateTime)
-                .page(page);
-
-        return Result.OK("充值套餐",page1);
-    }
-
-    //获取配置信息：折扣、客户电话、客户微信
-    @Override
-    public Result<?> getConfig(String keyValue) {
-
-        CheerConf one = cheerConfService.lambdaQuery()
-                .eq(CheerConf::getKeyValue, keyValue)
-                .one();
-        return Result.OK("配置信息", one);
-    }
-
-
-
-    //支付回调
-    @Override
-    public Object createNotify(String requestBody){
-        WxPayOrderNotifyResult notify = mpWxPayService.notify(requestBody);
-
-        String outTradeNo = notify.getOutTradeNo();
-
-        //开始处理业务逻辑
-        CheerWater  byId = cheerWaterService.getById(outTradeNo);
-
-        if(byId!=null){
-            if(!byId.getState().equals("1")){
-                cheerWaterService.lambdaUpdate()
-                        .set(CheerWater::getState,"1")
-                        .eq(CheerWater::getId,outTradeNo)
-                        .update();
-
-
-                //拼接打印信息
-                String content = printUtil.spellMessage();
-
-                //客户要求打印两次
-                printUtil.printBill(content);
-                printUtil.printBill(content);
-            }
-        }
-        return null;
-    }
-
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/LoginApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/LoginApiServiceImpl.java
index 2518231..dfda590 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/LoginApiServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/LoginApiServiceImpl.java
@@ -3,25 +3,16 @@ package org.jeecg.modules.apiservice.impl;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.apiservice.LoginApiService;
 import org.jeecg.modules.bean.LoginReq;
-import org.jeecg.modules.cheerConf.entity.CheerConf;
-import org.jeecg.modules.cheerConf.service.ICheerConfService;
-import org.jeecg.modules.cheerRecharge.entity.CheerRecharge;
-import org.jeecg.modules.cheerRecharge.service.ICheerRechargeService;
 import org.jeecg.modules.service.AppletLoginService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 @Service
 public class LoginApiServiceImpl implements LoginApiService {
 
     @Resource
     private AppletLoginService appletLoginService;
-    @Resource
-    private ICheerConfService cheerConfService;
-    @Resource
-    private ICheerRechargeService cheerRechargeService;
 
     //小程序-登录接口
     @Override
@@ -47,51 +38,4 @@ public class LoginApiServiceImpl implements LoginApiService {
         return Result.OK("隐私政策");
     }
 
-
-    //获取联系电话
-    @Override
-    public Result<?> getPhone(){
-        CheerConf one = cheerConfService.lambdaQuery()
-                .eq(CheerConf::getKeyValue, "phone")
-                .one();
-
-        return Result.OK("电话",one.getKeyCentent());
-    }
-
-    //获取联系微信
-    @Override
-    public Result<?> getWechat(){
-        CheerConf one = cheerConfService.lambdaQuery()
-                .eq(CheerConf::getKeyValue, "wx")
-                .one();
-
-        return Result.OK("微信",one.getKeyCentent());
-    }
-
-    //获取折扣
-    @Override
-    public Result<?> getDiscount(){
-        CheerConf one = cheerConfService.lambdaQuery()
-                .eq(CheerConf::getKeyValue, "preferential")
-                .one();
-
-        return Result.OK("折扣",one.getKeyCentent());
-    }
-
-
-    //获取套餐列表
-    @Override
-    public Result<?> getPackageList(){
-        List<CheerRecharge> list = cheerRechargeService.lambdaQuery()
-                .orderByDesc(CheerRecharge::getCreateTime)
-                .list();
-        return Result.OK("套餐列表",list);
-    }
-
-
-
-
-
-
-
 }