1、接口补充

.idea/workspace.xml

@@ -1,155 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="74ae82f3-7b81-42e8-8b53-827e18cc7011" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
+    <list default="true" id="74ae82f3-7b81-42e8-8b53-827e18cc7011" name="Default Changelist" comment="1、添加二维码推广接口&#10;2、用户信息相关接口修改(新增，修改，查询)">
       <change afterPath="$PROJECT_DIR$/admin-hanhai-vue/dist.zip" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/entity/CarrentApply.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/mapper/CarrentApplyMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/service/ICarrentApplyService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/service/impl/CarrentApplyServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/CarrentApplyList.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/modules/CarrentApplyForm.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue3/CarrentApply.data.ts" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategoryone/mapper/CarrentCategoryoneMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategoryone/service/ICarrentCategoryoneService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategoryone/service/impl/CarrentCategoryoneServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/controller/CarrentCategorytwoController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/mapper/CarrentCategorytwoMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/mapper/xml/CarrentCategorytwoMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/service/ICarrentCategorytwoService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/service/impl/CarrentCategorytwoServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue/modules/CarrentCategorytwoModal.Style#Drawer.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue/modules/CarrentCategorytwoModal.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue3/CarrentCategorytwo.api.ts" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue3/CarrentCategorytwoList.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue3/components/CarrentCategorytwoModal.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/mapper/CarrentConfigMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/service/ICarrentConfigService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/service/impl/CarrentConfigServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/mapper/CarrentGoodsMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/service/ICarrentGoodsService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/service/impl/CarrentGoodsServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/mapper/CarrentTypeMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/service/ICarrentTypeService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/service/impl/CarrentTypeServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/ApplyController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/BannerController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/ConfigController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/GoodsController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ApplyService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/BannerService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ConfigService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/GoodsService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ApplyServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/BannerServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/GoodsServiceImpl.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/controller/CarrentMileageController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/entity/CarrentMileage.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/mapper/CarrentMileageMapper.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/mapper/xml/CarrentMileageMapper.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/service/ICarrentMileageService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/service/impl/CarrentMileageServiceImpl.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/CarrentMileageList.vue" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageForm.vue" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageModal.Style#Drawer.vue" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageModal.vue" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileage.api.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileage.data.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileageList.vue" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/components/CarrentMileageModal.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/admin-hanhai-vue/.env.development" beforeDir="false" afterPath="$PROJECT_DIR$/admin-hanhai-vue/.env.development" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/admin-hanhai-vue/.env.production" beforeDir="false" afterPath="$PROJECT_DIR$/admin-hanhai-vue/.env.production" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/controller/CarrentAreaController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/controller/CarrentTypeController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/entity/CarrentArea.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/entity/CarrentConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/mapper/CarrentAreaMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/mapper/xml/CarrentAreaMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/mapper/xml/CarrentApplyMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/service/ICarrentAreaService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/service/impl/CarrentAreaServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue/CarrentAreaList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue/CarrentCategorytwoList.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue/modules/CarrentAreaForm.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue/modules/CarrentConfigForm.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue/modules/CarrentAreaModal.Style#Drawer.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/modules/CarrentApplyModal.Style#Drawer.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue/modules/CarrentAreaModal.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/modules/CarrentApplyModal.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue3/CarrentArea.api.ts" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/vue3/CarrentType.api.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue3/CarrentArea.data.ts" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue3/CarrentConfig.data.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue3/CarrentAreaList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/vue3/CarrentTypeList.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue3/components/CarrentAreaModal.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/vue3/components/CarrentTypeModal.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/controller/CarrentCarController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/controller/CarrentGoodsController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/entity/CarrentCar.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/entity/CarrentGoods.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/mapper/CarrentCarMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/mapper/xml/CarrentCarMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/mapper/xml/CarrentTypeMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/service/ICarrentCarService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/service/impl/CarrentCarServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue/CarrentCarList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue/CarrentGoodsList.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue/modules/CarrentCarForm.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue/modules/CarrentGoodsForm.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue/modules/CarrentCarModal.Style#Drawer.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/vue/modules/CarrentTypeModal.Style#Drawer.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue/modules/CarrentCarModal.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/vue/modules/CarrentTypeModal.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue3/CarrentCar.api.ts" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue3/CarrentApply.api.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue3/CarrentCar.data.ts" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue3/CarrentGoods.data.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue3/CarrentCarList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue3/CarrentApplyList.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue3/components/CarrentCarModal.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue3/components/CarrentApplyModal.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/controller/CarrentCategoryController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/controller/CarrentApplyController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/entity/CarrentCategory.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/entity/CarrentType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/mapper/CarrentCategoryMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/mapper/xml/CarrentCategoryMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/mapper/xml/CarrentGoodsMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/service/ICarrentCategoryService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/service/impl/CarrentCategoryServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue/CarrentCategoryList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/vue/CarrentTypeList.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue/modules/CarrentCategoryForm.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/vue/modules/CarrentTypeForm.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue/modules/CarrentCategoryModal.Style#Drawer.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue/modules/CarrentGoodsModal.Style#Drawer.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue/modules/CarrentCategoryModal.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue/modules/CarrentGoodsModal.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue3/CarrentCategory.api.ts" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue3/CarrentGoods.api.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue3/CarrentCategory.data.ts" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/vue3/CarrentType.data.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue3/CarrentCategoryList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue3/CarrentConfigList.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue3/components/CarrentCategoryModal.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue3/components/CarrentGoodsModal.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/controller/CarrentComponentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategoryone/controller/CarrentCategoryoneController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/entity/CarrentComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategoryone/entity/CarrentCategoryone.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/mapper/CarrentComponentMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/mapper/xml/CarrentComponentMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategoryone/mapper/xml/CarrentCategoryoneMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/service/ICarrentComponentService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/service/impl/CarrentComponentServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue/CarrentComponentList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategoryone/vue/CarrentCategoryoneList.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue/modules/CarrentComponentForm.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategoryone/vue/modules/CarrentCategoryoneForm.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue/modules/CarrentComponentModal.Style#Drawer.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategoryone/vue/modules/CarrentCategoryoneModal.Style#Drawer.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue/modules/CarrentComponentModal.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategoryone/vue/modules/CarrentCategoryoneModal.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue3/CarrentComponent.api.ts" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategoryone/vue3/CarrentCategoryone.api.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue3/CarrentComponent.data.ts" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategoryone/vue3/CarrentCategoryone.data.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue3/CarrentComponentList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategoryone/vue3/CarrentCategoryoneList.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue3/components/CarrentComponentModal.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategoryone/vue3/components/CarrentCategoryoneModal.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/controller/CarrentMileageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/controller/CarrentConfigController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/entity/CarrentMileage.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/entity/CarrentCategorytwo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/mapper/CarrentMileageMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/mapper/xml/CarrentMileageMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/mapper/xml/CarrentConfigMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/service/ICarrentMileageService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/service/impl/CarrentMileageServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/CarrentMileageList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue/CarrentConfigList.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageForm.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue/modules/CarrentCategorytwoForm.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageModal.Style#Drawer.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue/modules/CarrentConfigModal.Style#Drawer.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageModal.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue/modules/CarrentConfigModal.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileage.api.ts" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue3/CarrentConfig.api.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileage.data.ts" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue3/CarrentCategorytwo.data.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileageList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue3/CarrentGoodsList.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/components/CarrentMileageModal.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue3/components/CarrentConfigModal.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/controller/CarrentNewsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/controller/CarrentNewsController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/entity/CarrentNews.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/entity/CarrentNews.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/mapper/CarrentNewsMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/mapper/CarrentNewsMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/service/ICarrentNewsService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/service/ICarrentNewsService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/service/impl/CarrentNewsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/service/impl/CarrentNewsServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue/CarrentNewsList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue/CarrentNewsList.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue/modules/CarrentNewsForm.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue/modules/CarrentNewsForm.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue3/CarrentNews.data.ts" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue3/CarrentNews.data.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/controller/CarrentOrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/controller/CarrentOrderController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/entity/CarrentOrder.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/entity/CarrentOrder.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/mapper/CarrentOrderMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/mapper/CarrentOrderMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/service/ICarrentOrderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/service/ICarrentOrderService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/service/impl/CarrentOrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/service/impl/CarrentOrderServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/vue/CarrentOrderList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/vue/CarrentOrderList.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/vue/modules/CarrentOrderForm.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/vue/modules/CarrentOrderForm.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/vue3/CarrentOrder.data.ts" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/vue3/CarrentOrder.data.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/CarController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/CompanyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/CompanyController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-boot-base-api.iml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-boot-base-api.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/controller/CarrentCompanyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/controller/CarrentCompanyController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/entity/CarrentCompany.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/entity/CarrentCompany.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/mapper/CarrentCompanyMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/mapper/CarrentCompanyMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/service/ICarrentCompanyService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/service/ICarrentCompanyService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/service/impl/CarrentCompanyServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/service/impl/CarrentCompanyServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/CarrentCompanyList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/CarrentCompanyList.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/modules/CarrentCompanyForm.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/modules/CarrentCompanyForm.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue3/CarrentCompany.data.ts" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue3/CarrentCompany.data.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/controller/CarrentUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/controller/CarrentUserController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/entity/CarrentUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/entity/CarrentUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/mapper/CarrentUserMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/mapper/CarrentUserMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/ICarrentUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/ICarrentUserService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/impl/CarrentUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/impl/CarrentUserServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/CarrentUserList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/CarrentUserList.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/modules/CarrentUserForm.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/modules/CarrentUserForm.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUser.data.ts" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUser.data.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUserList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUserList.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/AppletLoginService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/AppletLoginService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/jeecg-boot-module-system.iml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/jeecg-boot-module-system.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/ConfigController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/ConfigController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/LoginApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/LoginApiController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/NewsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/NewsController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/OrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/OrderController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/UserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/UserController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/CarBean.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/OrderBean.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CarService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CompanyService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CompanyService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/OrderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/OrderService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/WxQrCodeVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/WxQrCodeVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ConfigService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ConfigService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/LoginApiService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/LoginApiService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CarServiceImpl.java" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CompanyServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CompanyServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/NewsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/NewsServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/LoginApiServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/LoginApiServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/RecommendServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/RecommendServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserServiceImpl.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -181,6 +87,7 @@
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+    <option name="UPDATE_TYPE" value="MERGE" />
   </component>
   <component name="MavenImportPreferences">
     <option name="generalSettings">
@@ -216,7 +123,7 @@
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/.." />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean" />
     <property name="nodejs_package_manager_path" value="yarn" />
     <property name="project.structure.last.edited" value="Project" />
     <property name="project.structure.proportion" value="0.0" />
@@ -234,6 +141,9 @@
       <recent name="org.jeecg.modules.apiService" />
       <recent name="org.jeecg.modules.api.carrentController" />
     </key>
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\Projects\carrent-admin\jeecg-boot-module-system\src\main\java\org\jeecg\modules\apiBean" />
+    </key>
   </component>
   <component name="RunManager" selected="Spring Boot.JeecgSystemApplication">
     <configuration name="JeecgSystemApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
@@ -285,7 +195,7 @@
       <workItem from="1731750561470" duration="9951000" />
       <workItem from="1733103883735" duration="17631000" />
       <workItem from="1733710180531" duration="11896000" />
-      <workItem from="1733968817518" duration="25748000" />
+      <workItem from="1733968817518" duration="58456000" />
     </task>
     <task id="LOCAL-00001" summary="1、项目初始化">
       <created>1731385713383</created>
@@ -343,7 +253,21 @@
       <option name="project" value="LOCAL" />
       <updated>1733880722458</updated>
     </task>
-    <option name="localTasksCounter" value="9" />
+    <task id="LOCAL-00009" summary="1、接口添加">
+      <created>1734423679428</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1734423679429</updated>
+    </task>
+    <task id="LOCAL-00010" summary="1、添加二维码推广接口&#10;2、用户信息相关接口修改(新增，修改，查询)">
+      <created>1734431528564</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1734431528564</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -370,19 +294,20 @@
     <MESSAGE value="1、企业信息相关接口添加&#10;2、个人信息相关接口添加&#10;3、商品信息相关接口添加&#10;4、新闻信息相关接口添加&#10;5、预约信息相关接口添加" />
     <MESSAGE value="1、权限验证添加" />
     <MESSAGE value="1、权限验证补充" />
-    <MESSAGE value="1、接口添加" />
     <MESSAGE value="1、登录接口添加" />
-    <option name="LAST_COMMIT_MESSAGE" value="1、登录接口添加" />
+    <MESSAGE value="1、接口添加" />
+    <MESSAGE value="1、添加二维码推广接口&#10;2、用户信息相关接口修改(新增，修改，查询)" />
+    <option name="LAST_COMMIT_MESSAGE" value="1、添加二维码推广接口&#10;2、用户信息相关接口修改(新增，修改，查询)" />
   </component>
   <component name="WindowStateProjectService">
     <state x="734" y="358" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1731382591329">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="734" y="358" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1731382591329" />
-    <state x="1085" y="408" key="#com.intellij.ide.util.MemberChooser" timestamp="1734421446278">
+    <state x="1085" y="408" key="#com.intellij.ide.util.MemberChooser" timestamp="1735221428472">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="1085" y="408" key="#com.intellij.ide.util.MemberChooser/0.0.2560.1400@0.0.2560.1400" timestamp="1734421446278" />
+    <state x="1085" y="408" key="#com.intellij.ide.util.MemberChooser/0.0.2560.1400@0.0.2560.1400" timestamp="1735221428472" />
     <state x="911" y="566" width="737" height="272" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes" timestamp="1733193951942">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
@@ -391,93 +316,101 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="1010" y="449" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1733992136886" />
-    <state x="713" y="297" key="CommitChangelistDialog2" timestamp="1733880721760">
+    <state x="713" y="297" key="CommitChangelistDialog2" timestamp="1735225082873">
+      <screen x="0" y="0" width="2560" height="1400" />
+    </state>
+    <state x="713" y="297" key="CommitChangelistDialog2/0.0.2560.1400@0.0.2560.1400" timestamp="1735225082873" />
+    <state x="184" y="122" width="2048" height="1148" key="DiffContextDialog" timestamp="1734432960075">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="713" y="297" key="CommitChangelistDialog2/0.0.2560.1400@0.0.2560.1400" timestamp="1733880721760" />
-    <state x="184" y="122" width="2048" height="1148" key="DiffContextDialog" timestamp="1733221606315">
+    <state x="184" y="122" width="2048" height="1148" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1734432960075" />
+    <state width="2517" height="292" key="GridCell.Tab.0.bottom" timestamp="1735225123112">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="184" y="122" width="2048" height="1148" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1733221606315" />
-    <state width="2500" height="488" key="GridCell.Tab.0.bottom" timestamp="1734423359071">
+    <state width="2517" height="292" key="GridCell.Tab.0.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1735225123112" />
+    <state width="2517" height="292" key="GridCell.Tab.0.center" timestamp="1735225123112">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2500" height="488" key="GridCell.Tab.0.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1734423359071" />
-    <state width="2500" height="488" key="GridCell.Tab.0.center" timestamp="1734423359071">
+    <state width="2517" height="292" key="GridCell.Tab.0.center/0.0.2560.1400@0.0.2560.1400" timestamp="1735225123112" />
+    <state width="2517" height="292" key="GridCell.Tab.0.left" timestamp="1735225123112">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2500" height="488" key="GridCell.Tab.0.center/0.0.2560.1400@0.0.2560.1400" timestamp="1734423359071" />
-    <state width="2500" height="488" key="GridCell.Tab.0.left" timestamp="1734423359071">
+    <state width="2517" height="292" key="GridCell.Tab.0.left/0.0.2560.1400@0.0.2560.1400" timestamp="1735225123112" />
+    <state width="2517" height="292" key="GridCell.Tab.0.right" timestamp="1735225123112">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2500" height="488" key="GridCell.Tab.0.left/0.0.2560.1400@0.0.2560.1400" timestamp="1734423359071" />
-    <state width="2500" height="488" key="GridCell.Tab.0.right" timestamp="1734423359071">
+    <state width="2517" height="292" key="GridCell.Tab.0.right/0.0.2560.1400@0.0.2560.1400" timestamp="1735225123112" />
+    <state width="2517" height="292" key="GridCell.Tab.1.bottom" timestamp="1735225123113">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2500" height="488" key="GridCell.Tab.0.right/0.0.2560.1400@0.0.2560.1400" timestamp="1734423359071" />
-    <state width="2500" height="488" key="GridCell.Tab.1.bottom" timestamp="1734423358980">
+    <state width="2517" height="292" key="GridCell.Tab.1.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1735225123113" />
+    <state width="2517" height="292" key="GridCell.Tab.1.center" timestamp="1735225123112">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2500" height="488" key="GridCell.Tab.1.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1734423358980" />
-    <state width="2500" height="488" key="GridCell.Tab.1.center" timestamp="1734423358980">
+    <state width="2517" height="292" key="GridCell.Tab.1.center/0.0.2560.1400@0.0.2560.1400" timestamp="1735225123112" />
+    <state width="2517" height="292" key="GridCell.Tab.1.left" timestamp="1735225123112">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2500" height="488" key="GridCell.Tab.1.center/0.0.2560.1400@0.0.2560.1400" timestamp="1734423358980" />
-    <state width="2500" height="488" key="GridCell.Tab.1.left" timestamp="1734423358980">
+    <state width="2517" height="292" key="GridCell.Tab.1.left/0.0.2560.1400@0.0.2560.1400" timestamp="1735225123112" />
+    <state width="2517" height="292" key="GridCell.Tab.1.right" timestamp="1735225123113">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2500" height="488" key="GridCell.Tab.1.left/0.0.2560.1400@0.0.2560.1400" timestamp="1734423358980" />
-    <state width="2500" height="488" key="GridCell.Tab.1.right" timestamp="1734423358980">
+    <state width="2517" height="292" key="GridCell.Tab.1.right/0.0.2560.1400@0.0.2560.1400" timestamp="1735225123113" />
+    <state width="2517" height="292" key="GridCell.Tab.2.bottom" timestamp="1735225123113">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2500" height="488" key="GridCell.Tab.1.right/0.0.2560.1400@0.0.2560.1400" timestamp="1734423358980" />
-    <state width="2500" height="488" key="GridCell.Tab.2.bottom" timestamp="1734423358980">
+    <state width="2517" height="292" key="GridCell.Tab.2.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1735225123113" />
+    <state width="2517" height="292" key="GridCell.Tab.2.center" timestamp="1735225123113">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2500" height="488" key="GridCell.Tab.2.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1734423358980" />
-    <state width="2500" height="488" key="GridCell.Tab.2.center" timestamp="1734423358980">
+    <state width="2517" height="292" key="GridCell.Tab.2.center/0.0.2560.1400@0.0.2560.1400" timestamp="1735225123113" />
+    <state width="2517" height="292" key="GridCell.Tab.2.left" timestamp="1735225123113">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2500" height="488" key="GridCell.Tab.2.center/0.0.2560.1400@0.0.2560.1400" timestamp="1734423358980" />
-    <state width="2500" height="488" key="GridCell.Tab.2.left" timestamp="1734423358980">
+    <state width="2517" height="292" key="GridCell.Tab.2.left/0.0.2560.1400@0.0.2560.1400" timestamp="1735225123113" />
+    <state width="2517" height="292" key="GridCell.Tab.2.right" timestamp="1735225123113">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2500" height="488" key="GridCell.Tab.2.left/0.0.2560.1400@0.0.2560.1400" timestamp="1734423358980" />
-    <state width="2500" height="488" key="GridCell.Tab.2.right" timestamp="1734423358980">
+    <state width="2517" height="292" key="GridCell.Tab.2.right/0.0.2560.1400@0.0.2560.1400" timestamp="1735225123113" />
+    <state x="1079" y="413" key="RollbackChangesDialog" timestamp="1734501842073">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2500" height="488" key="GridCell.Tab.2.right/0.0.2560.1400@0.0.2560.1400" timestamp="1734423358980" />
+    <state x="1079" y="413" key="RollbackChangesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1734501842073" />
     <state x="783" y="345" key="SettingsEditor" timestamp="1732701780265">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="783" y="345" key="SettingsEditor/0.0.2560.1400@0.0.2560.1400" timestamp="1732701780265" />
-    <state x="872" y="436" key="Vcs.Push.Dialog.v2" timestamp="1733880726770">
+    <state x="872" y="436" key="Vcs.Push.Dialog.v2" timestamp="1734431532869">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="872" y="436" key="Vcs.Push.Dialog.v2/0.0.2560.1400@0.0.2560.1400" timestamp="1733880726770" />
+    <state x="872" y="436" key="Vcs.Push.Dialog.v2/0.0.2560.1400@0.0.2560.1400" timestamp="1734431532869" />
     <state x="972" y="527" key="com.intellij.ide.util.TipDialog" timestamp="1731750734819">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="972" y="527" key="com.intellij.ide.util.TipDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1731750734819" />
-    <state x="900" y="426" width="759" height="548" key="find.popup" timestamp="1734000391241">
+    <state x="1074" y="618" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1735193649268">
+      <screen x="0" y="0" width="2560" height="1400" />
+    </state>
+    <state x="1074" y="618" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.2560.1400@0.0.2560.1400" timestamp="1735193649268" />
+    <state x="900" y="426" width="759" height="548" key="find.popup" timestamp="1734501255473">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="900" y="426" width="759" height="548" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1734000391241" />
+    <state x="900" y="426" width="759" height="548" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1734501255473" />
     <state x="921" y="426" width="700" height="530" key="recent.locations.popup" timestamp="1733992805258">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="921" y="426" width="700" height="530" key="recent.locations.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1733992805258" />
-    <state x="943" y="315" width="672" height="678" key="search.everywhere.popup" timestamp="1733997445096">
+    <state x="943" y="315" width="672" height="678" key="search.everywhere.popup" timestamp="1735224695948">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="943" y="315" width="672" height="678" key="search.everywhere.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1733997445096" />
+    <state x="943" y="315" width="672" height="678" key="search.everywhere.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1735224695948" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java</url>
-          <line>206</line>
+          <line>237</line>
           <option name="timeStamp" value="6" />
         </line-breakpoint>
       </breakpoints>

admin-hanhai-vue/.env.development

@@ -1,4 +1,5 @@
 NODE_ENV=development
+//VUE_APP_API_BASE_URL=https://carrentadmin.augcl.com/carrent-admin/
 VUE_APP_API_BASE_URL=http://localhost:8003/carrent-admin/
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

admin-hanhai-vue/.env.production

@@ -1,4 +1,5 @@
 NODE_ENV=production
+//VUE_APP_API_BASE_URL=https://carrentadmin.augcl.com/carrent-admin/
 VUE_APP_API_BASE_URL=http://localhost:8003/carrent-admin/
 VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

jeecg-boot-base/jeecg-boot-base-api/jeecg-boot-base-api.iml

@@ -214,6 +214,7 @@
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-kotlin:2.13.2" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.6.10" level="project" />
     <orderEntry type="library" name="Maven: bouncycastle:bcprov-jdk14:138" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.6.6" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.6.6" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.6.6" level="project" />
@@ -248,7 +249,6 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:4.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.18" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.18" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.18" level="project" />

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml

@@ -239,6 +239,7 @@
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-kotlin:2.13.2" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.6.10" level="project" />
     <orderEntry type="library" name="Maven: bouncycastle:bcprov-jdk14:138" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.6.6" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.6.6" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.6.6" level="project" />
@@ -273,7 +274,6 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:4.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.18" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.18" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.18" level="project" />

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml

@@ -225,6 +225,7 @@
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-kotlin:2.13.2" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.6.10" level="project" />
     <orderEntry type="library" name="Maven: bouncycastle:bcprov-jdk14:138" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.6.6" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.6.6" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.6.6" level="project" />
@@ -259,7 +260,6 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:4.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.18" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.18" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.18" level="project" />

jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml

@@ -235,6 +235,7 @@
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-kotlin:2.13.2" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.6.10" level="project" />
     <orderEntry type="library" name="Maven: bouncycastle:bcprov-jdk14:138" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.6.6" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.6.6" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.6.6" level="project" />
@@ -259,7 +260,6 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:4.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.18" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.18" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.18" level="project" />

jeecg-boot-base/jeecg-boot-base-core/pom.xml

@@ -260,6 +260,12 @@
 			<version>138</version>
 			<scope>compile</scope>
 		</dependency>
+        <dependency>
+            <groupId>com.vaadin.external.google</groupId>
+            <artifactId>android-json</artifactId>
+            <version>0.0.20131108.vaadin1</version>
+            <scope>compile</scope>
+        </dependency>
 
 
     </dependencies>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/controller/CarrentCompanyController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 企业信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-03
+ * @Date:   2024-12-26
  * @Version: V1.0
  */
 @Api(tags="企业信息表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/entity/CarrentCompany.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 企业信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-03
+ * @Date:   2024-12-26
  * @Version: V1.0
  */
 @Data
@@ -67,6 +67,10 @@ public class CarrentCompany implements Serializable {
 	@Excel(name = "营业执照", width = 15)
     @ApiModelProperty(value = "营业执照")
     private java.lang.String businessLicense;
+	/**状态*/
+	@Excel(name = "状态", width = 15)
+    @ApiModelProperty(value = "状态")
+    private java.lang.String status;
 	/**关联用户*/
 	@Excel(name = "关联用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
 	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/mapper/CarrentCompanyMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 企业信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-03
+ * @Date:   2024-12-26
  * @Version: V1.0
  */
 public interface CarrentCompanyMapper extends BaseMapper<CarrentCompany> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/service/ICarrentCompanyService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 企业信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-03
+ * @Date:   2024-12-26
  * @Version: V1.0
  */
 public interface ICarrentCompanyService extends IService<CarrentCompany> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/service/impl/CarrentCompanyServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 企业信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-03
+ * @Date:   2024-12-26
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/CarrentCompanyList.vue

@@ -148,6 +148,11 @@
             dataIndex: 'businessLicense',
             scopedSlots: {customRender: 'imgSlot'}
           },
+          {
+            title:'状态',
+            align:"center",
+            dataIndex: 'status'
+          },
           {
             title:'关联用户',
             align:"center",
@@ -192,6 +197,7 @@
         fieldList.push({type:'string',value:'phone',text:'联系电话',dictCode:''})
         fieldList.push({type:'string',value:'address',text:'公司地址',dictCode:''})
         fieldList.push({type:'string',value:'businessLicense',text:'营业执照',dictCode:''})
+        fieldList.push({type:'string',value:'status',text:'状态',dictCode:'authentic_status'})
         fieldList.push({type:'string',value:'userId',text:'关联用户',dictCode:"han_hai_member,nick_name,id"})
         this.superFieldList = fieldList
       }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/modules/CarrentCompanyForm.vue

@@ -28,6 +28,11 @@
               <j-image-upload isMultiple  v-model="model.businessLicense" ></j-image-upload>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
+              <a-input v-model="model.status" 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-dict-select-tag type="list" v-model="model.userId" dictCode="han_hai_member,nick_name,id" placeholder="请选择关联用户" />

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue3/CarrentCompany.data.ts

@@ -30,6 +30,11 @@ export const columns: BasicColumn[] = [
     dataIndex: 'businessLicense',
     customRender:render.renderAvatar,
    },
+   {
+    title: '状态',
+    align:"center",
+    dataIndex: 'status'
+   },
    {
     title: '关联用户',
     align:"center",
@@ -68,6 +73,11 @@ export const formSchema: FormSchema[] = [
      componentProps:{
       },
   },
+  {
+    label: '状态',
+    field: 'status',
+    component: 'Input',
+  },
   {
     label: '关联用户',
     field: 'userId',

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/controller/CarrentMileageController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.carrentMileage.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.carrentMileage.entity.CarrentMileage;
+import org.jeecg.modules.carrentMileage.service.ICarrentMileageService;
+
+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-12-26
+ * @Version: V1.0
+ */
+@Api(tags="公里数信息表")
+@RestController
+@RequestMapping("/carrentMileage/carrentMileage")
+@Slf4j
+public class CarrentMileageController extends JeecgController<CarrentMileage, ICarrentMileageService> {
+	@Autowired
+	private ICarrentMileageService carrentMileageService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param carrentMileage
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "公里数信息表-分页列表查询")
+	@ApiOperation(value="公里数信息表-分页列表查询", notes="公里数信息表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CarrentMileage>> queryPageList(CarrentMileage carrentMileage,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<CarrentMileage> queryWrapper = QueryGenerator.initQueryWrapper(carrentMileage, req.getParameterMap());
+		Page<CarrentMileage> page = new Page<CarrentMileage>(pageNo, pageSize);
+		IPage<CarrentMileage> pageList = carrentMileageService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param carrentMileage
+	 * @return
+	 */
+	@AutoLog(value = "公里数信息表-添加")
+	@ApiOperation(value="公里数信息表-添加", notes="公里数信息表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CarrentMileage carrentMileage) {
+		carrentMileageService.save(carrentMileage);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param carrentMileage
+	 * @return
+	 */
+	@AutoLog(value = "公里数信息表-编辑")
+	@ApiOperation(value="公里数信息表-编辑", notes="公里数信息表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CarrentMileage carrentMileage) {
+		carrentMileageService.updateById(carrentMileage);
+		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) {
+		carrentMileageService.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.carrentMileageService.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<CarrentMileage> queryById(@RequestParam(name="id",required=true) String id) {
+		CarrentMileage carrentMileage = carrentMileageService.getById(id);
+		if(carrentMileage==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(carrentMileage);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param carrentMileage
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CarrentMileage carrentMileage) {
+        return super.exportXls(request, carrentMileage, CarrentMileage.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, CarrentMileage.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/entity/CarrentMileage.java

@@ -0,0 +1,54 @@
+package org.jeecg.modules.carrentMileage.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-12-26
+ * @Version: V1.0
+ */
+@Data
+@TableName("carrent_mileage")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="carrent_mileage对象", description="公里数信息表")
+public class CarrentMileage 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.Integer mileage;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/mapper/CarrentMileageMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.carrentMileage.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.carrentMileage.entity.CarrentMileage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 公里数信息表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-26
+ * @Version: V1.0
+ */
+public interface CarrentMileageMapper extends BaseMapper<CarrentMileage> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/mapper/xml/CarrentMileageMapper.xml

@@ -0,0 +1,5 @@
+<?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.carrentMileage.mapper.CarrentMileageMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/service/ICarrentMileageService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.carrentMileage.service;
+
+import org.jeecg.modules.carrentMileage.entity.CarrentMileage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 公里数信息表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-26
+ * @Version: V1.0
+ */
+public interface ICarrentMileageService extends IService<CarrentMileage> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/service/impl/CarrentMileageServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.carrentMileage.service.impl;
+
+import org.jeecg.modules.carrentMileage.entity.CarrentMileage;
+import org.jeecg.modules.carrentMileage.mapper.CarrentMileageMapper;
+import org.jeecg.modules.carrentMileage.service.ICarrentMileageService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 公里数信息表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-26
+ * @Version: V1.0
+ */
+@Service
+public class CarrentMileageServiceImpl extends ServiceImpl<CarrentMileageMapper, CarrentMileage> implements ICarrentMileageService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/CarrentMileageList.vue

@@ -0,0 +1,171 @@
+<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>
+
+    <carrent-mileage-modal ref="modalForm" @ok="modalFormOk"></carrent-mileage-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CarrentMileageModal from './modules/CarrentMileageModal'
+
+  export default {
+    name: 'CarrentMileageList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CarrentMileageModal
+    },
+    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: 'mileage'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/carrentMileage/carrentMileage/list",
+          delete: "/carrentMileage/carrentMileage/delete",
+          deleteBatch: "/carrentMileage/carrentMileage/deleteBatch",
+          exportXlsUrl: "/carrentMileage/carrentMileage/exportXls",
+          importExcelUrl: "carrentMileage/carrentMileage/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'int',value:'mileage',text:'公里数(万)',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageForm.vue

@@ -0,0 +1,104 @@
+<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="mileage">
+              <a-input-number v-model="model.mileage" 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: 'CarrentMileageForm',
+    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: "/carrentMileage/carrentMileage/add",
+          edit: "/carrentMileage/carrentMileage/edit",
+          queryById: "/carrentMileage/carrentMileage/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>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <carrent-mileage-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></carrent-mileage-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 CarrentMileageForm from './CarrentMileageForm'
+
+  export default {
+    name: 'CarrentMileageModal',
+    components: {
+      CarrentMileageForm
+    },
+    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>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/modules/CarrentMileageModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <carrent-mileage-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></carrent-mileage-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CarrentMileageForm from './CarrentMileageForm'
+  export default {
+    name: 'CarrentMileageModal',
+    components: {
+      CarrentMileageForm
+    },
+    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>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileage.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/carrentMileage/carrentMileage/list',
+  save='/carrentMileage/carrentMileage/add',
+  edit='/carrentMileage/carrentMileage/edit',
+  deleteOne = '/carrentMileage/carrentMileage/delete',
+  deleteBatch = '/carrentMileage/carrentMileage/deleteBatch',
+  importExcel = '/carrentMileage/carrentMileage/importExcel',
+  exportXls = '/carrentMileage/carrentMileage/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});
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileage.data.ts

@@ -0,0 +1,23 @@
+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: 'mileage'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '公里数(万)',
+    field: 'mileage',
+    component: 'InputNumber',
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/CarrentMileageList.vue

@@ -0,0 +1,162 @@
+<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>
+    <!-- 表单区域 -->
+    <CarrentMileageModal @register="registerModal" @success="handleSuccess"></CarrentMileageModal>
+  </div>
+</template>
+
+<script lang="ts" name="carrentMileage-carrentMileage" 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 CarrentMileageModal from './components/CarrentMileageModal.vue'
+  import {columns, searchFormSchema} from './carrentMileage.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './carrentMileage.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>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue3/components/CarrentMileageModal.vue

@@ -0,0 +1,58 @@
+<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 '../carrentMileage.data';
+    import {saveOrUpdate} from '../carrentMileage.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>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/controller/CarrentUserController.java

@@ -37,12 +37,12 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 
  /**
- * @Description: 个人信息表
+ * @Description: 个人实名信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-12
+ * @Date:   2024-12-26
  * @Version: V1.0
  */
-@Api(tags="个人信息表")
+@Api(tags="个人实名信息表")
 @RestController
 @RequestMapping("/carrentUser/carrentUser")
 @Slf4j
@@ -59,8 +59,8 @@ public class CarrentUserController extends JeecgController<CarrentUser, ICarrent
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "个人信息表-分页列表查询")
-	@ApiOperation(value="个人信息表-分页列表查询", notes="个人信息表-分页列表查询")
+	//@AutoLog(value = "个人实名信息表-分页列表查询")
+	@ApiOperation(value="个人实名信息表-分页列表查询", notes="个人实名信息表-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<CarrentUser>> queryPageList(CarrentUser carrentUser,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -78,8 +78,8 @@ public class CarrentUserController extends JeecgController<CarrentUser, ICarrent
 	 * @param carrentUser
 	 * @return
 	 */
-	@AutoLog(value = "个人信息表-添加")
-	@ApiOperation(value="个人信息表-添加", notes="个人信息表-添加")
+	@AutoLog(value = "个人实名信息表-添加")
+	@ApiOperation(value="个人实名信息表-添加", notes="个人实名信息表-添加")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody CarrentUser carrentUser) {
 		carrentUserService.save(carrentUser);
@@ -92,8 +92,8 @@ public class CarrentUserController extends JeecgController<CarrentUser, ICarrent
 	 * @param carrentUser
 	 * @return
 	 */
-	@AutoLog(value = "个人信息表-编辑")
-	@ApiOperation(value="个人信息表-编辑", notes="个人信息表-编辑")
+	@AutoLog(value = "个人实名信息表-编辑")
+	@ApiOperation(value="个人实名信息表-编辑", notes="个人实名信息表-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody CarrentUser carrentUser) {
 		carrentUserService.updateById(carrentUser);
@@ -106,8 +106,8 @@ public class CarrentUserController extends JeecgController<CarrentUser, ICarrent
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "个人信息表-通过id删除")
-	@ApiOperation(value="个人信息表-通过id删除", notes="个人信息表-通过id删除")
+	@AutoLog(value = "个人实名信息表-通过id删除")
+	@ApiOperation(value="个人实名信息表-通过id删除", notes="个人实名信息表-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		carrentUserService.removeById(id);
@@ -120,8 +120,8 @@ public class CarrentUserController extends JeecgController<CarrentUser, ICarrent
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "个人信息表-批量删除")
-	@ApiOperation(value="个人信息表-批量删除", notes="个人信息表-批量删除")
+	@AutoLog(value = "个人实名信息表-批量删除")
+	@ApiOperation(value="个人实名信息表-批量删除", notes="个人实名信息表-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.carrentUserService.removeByIds(Arrays.asList(ids.split(",")));
@@ -134,8 +134,8 @@ public class CarrentUserController extends JeecgController<CarrentUser, ICarrent
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "个人信息表-通过id查询")
-	@ApiOperation(value="个人信息表-通过id查询", notes="个人信息表-通过id查询")
+	//@AutoLog(value = "个人实名信息表-通过id查询")
+	@ApiOperation(value="个人实名信息表-通过id查询", notes="个人实名信息表-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<CarrentUser> queryById(@RequestParam(name="id",required=true) String id) {
 		CarrentUser carrentUser = carrentUserService.getById(id);
@@ -153,7 +153,7 @@ public class CarrentUserController extends JeecgController<CarrentUser, ICarrent
     */
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, CarrentUser carrentUser) {
-        return super.exportXls(request, carrentUser, CarrentUser.class, "个人信息表");
+        return super.exportXls(request, carrentUser, CarrentUser.class, "个人实名信息表");
     }
 
     /**

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/entity/CarrentUser.java

@@ -18,16 +18,16 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @Description: 个人信息表
+ * @Description: 个人实名信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-12
+ * @Date:   2024-12-26
  * @Version: V1.0
  */
 @Data
 @TableName("carrent_user")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="carrent_user对象", description="个人信息表")
+@ApiModel(value="carrent_user对象", description="个人实名信息表")
 public class CarrentUser implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -63,6 +63,10 @@ public class CarrentUser implements Serializable {
 	@Excel(name = "身份证正面照", width = 15)
     @ApiModelProperty(value = "身份证正面照")
     private java.lang.String cerImage;
+	/**状态*/
+	@Excel(name = "状态", width = 15)
+    @ApiModelProperty(value = "状态")
+    private java.lang.String status;
 	/**关联用户id*/
 	@Excel(name = "关联用户id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
 	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/mapper/CarrentUserMapper.java

@@ -7,9 +7,9 @@ import org.jeecg.modules.carrentUser.entity.CarrentUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
- * @Description: 个人信息表
+ * @Description: 个人实名信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-12
+ * @Date:   2024-12-26
  * @Version: V1.0
  */
 public interface CarrentUserMapper extends BaseMapper<CarrentUser> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/ICarrentUserService.java

@@ -4,9 +4,9 @@ import org.jeecg.modules.carrentUser.entity.CarrentUser;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
- * @Description: 个人信息表
+ * @Description: 个人实名信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-12
+ * @Date:   2024-12-26
  * @Version: V1.0
  */
 public interface ICarrentUserService extends IService<CarrentUser> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/impl/CarrentUserServiceImpl.java

@@ -8,9 +8,9 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
- * @Description: 个人信息表
+ * @Description: 个人实名信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-12
+ * @Date:   2024-12-26
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/CarrentUserList.vue

@@ -12,7 +12,7 @@
     <!-- 操作按钮区域 -->
     <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-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>
@@ -109,7 +109,7 @@
     },
     data () {
       return {
-        description: '个人信息表管理页面',
+        description: '个人实名信息表管理页面',
         // 表头
         columns: [
           {
@@ -143,6 +143,11 @@
             dataIndex: 'cerImage',
             scopedSlots: {customRender: 'imgSlot'}
           },
+          {
+            title:'状态',
+            align:"center",
+            dataIndex: 'status'
+          },
           {
             title:'关联用户id',
             align:"center",
@@ -186,6 +191,7 @@
         fieldList.push({type:'string',value:'phone',text:'联系方式',dictCode:''})
         fieldList.push({type:'string',value:'cerNo',text:'身份证号码',dictCode:''})
         fieldList.push({type:'string',value:'cerImage',text:'身份证正面照',dictCode:''})
+        fieldList.push({type:'string',value:'status',text:'状态',dictCode:'authentic_status'})
         fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"})
         this.superFieldList = fieldList
       }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/modules/CarrentUserForm.vue

@@ -23,6 +23,11 @@
               <j-image-upload isMultiple  v-model="model.cerImage" ></j-image-upload>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
+              <a-input v-model="model.status" placeholder="请输入状态"  ></a-input>
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="关联用户id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
               <j-dict-select-tag type="list" v-model="model.userId" dictCode="han_hai_member,nick_name,id" placeholder="请选择关联用户id" />

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUser.data.ts

@@ -25,6 +25,11 @@ export const columns: BasicColumn[] = [
     dataIndex: 'cerImage',
     customRender:render.renderAvatar,
    },
+   {
+    title: '状态',
+    align:"center",
+    dataIndex: 'status'
+   },
    {
     title: '关联用户id',
     align:"center",
@@ -58,6 +63,11 @@ export const formSchema: FormSchema[] = [
      componentProps:{
       },
   },
+  {
+    label: '状态',
+    field: 'status',
+    component: 'Input',
+  },
   {
     label: '关联用户id',
     field: 'userId',

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUserList.vue

@@ -53,7 +53,7 @@
   //注册table数据
   const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
       tableProps:{
-           title: '个人信息表',
+           title: '个人实名信息表',
            api: list,
            columns,
            canResize:false,
@@ -70,7 +70,7 @@
             },
       },
        exportConfig: {
-            name:"个人信息表",
+            name:"个人实名信息表",
             url: getExportUrl,
           },
           importConfig: {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/AppletLoginService.java

@@ -12,10 +12,10 @@ public interface AppletLoginService {
     Result<Object> appletLogin(LoginReq loginReq);
 
 
-//    /**
-//     * 微信小程序登录绑定手机号码接口
-//     * @param loginReq
-//     * @return
-//     */
-//    Result<Object> bindPhone(LoginReq loginReq);
+    /**
+     * 微信小程序登录绑定手机号码接口
+     * @param code
+     * @return
+     */
+    Result<Object> bindPhone(String  code);
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java

@@ -16,6 +16,12 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -106,6 +112,67 @@ public class AppletLoginServiceImpl implements AppletLoginService {
         return result;
     }
 
+    private static final String TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=%s&secret=%s";
+    public  String getAccessToken() throws Exception {
+        String requestUrl = String.format(TOKEN_URL, mpAppId, mpAppSecret);
+        URL url = new URL(requestUrl);
+        HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+        conn.setRequestMethod("GET");
+
+        try (BufferedReader br = new BufferedReader(
+                new InputStreamReader(conn.getInputStream(), "UTF-8"))) {
+            StringBuilder response = new StringBuilder();
+            String responseLine;
+            while ((responseLine = br.readLine()) != null) {
+                response.append(responseLine.trim());
+            }
+
+            org.json.JSONObject jsonResponse = new org.json.JSONObject(response.toString());
+            return jsonResponse.getString("access_token");
+        }
+    }
+
+    private static final String API_URL = "https://api.weixin.qq.com/wxa/business/getuserphonenumber";
+    public String getPhoneNumber(String code) throws Exception {
+        URL url = new URL(API_URL + "?access_token=" + this.getAccessToken());
+        HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+        conn.setRequestMethod("POST");
+        conn.setRequestProperty("Content-Type", "application/json; utf-8");
+        conn.setRequestProperty("Accept", "application/json");
+        conn.setDoOutput(true);
+
+        JSONObject jsonInput = new JSONObject();
+        jsonInput.put("code", code);
+
+        try (DataOutputStream os = new DataOutputStream(conn.getOutputStream())) {
+            byte[] input = jsonInput.toString().getBytes(StandardCharsets.UTF_8);
+            os.write(input, 0, input.length);
+        }
+
+        try (BufferedReader br = new BufferedReader(
+                new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8))) {
+            StringBuilder response = new StringBuilder();
+            String responseLine;
+            while ((responseLine = br.readLine()) != null) {
+                response.append(responseLine.trim());
+            }
+            //获取手机号码
+            return response.toString();
+        }
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Result<Object> bindPhone(String code) {
+        try {
+            String phoneNumber = this.getPhoneNumber(code);
+            return Result.OK(phoneNumber);
+        }catch (Exception e){
+            return Result.error(e.getMessage());
+        }
+    }
+
+
 
 //    /**
 //     * 微信小程序登录绑定手机号码接口

jeecg-boot-module-system/jeecg-boot-module-system.iml

@@ -163,6 +163,7 @@
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-kotlin:2.13.2" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.6.10" level="project" />
     <orderEntry type="library" name="Maven: bouncycastle:bcprov-jdk14:138" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
     <orderEntry type="library" name="Maven: org.jeecgframework:jeewx-api:1.4.7" level="project" />
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
@@ -323,7 +324,6 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:4.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.18" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.18" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.18" level="project" />

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/ConfigController.java

@@ -47,6 +47,12 @@ public class ConfigController {
         return configService.queryCatogoryTwoList(pageBean);
     }
 
+    @ApiOperation(value="配置信息-获取公里数列表", notes="配置信息-获取公里数列表")
+    @RequestMapping(value = "/queryMileageList", method = {RequestMethod.GET})
+    public Result<?> queryMileageList(){
+        return configService.queryMileageList();
+    }
+
     @ApiOperation(value="配置信息-获取隐私政策", notes="配置信息-获取隐私政策")
     @RequestMapping(value = "/queryPrivacy", method = {RequestMethod.GET})
     public Result<?> queryPrivacy(){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/LoginApiController.java

@@ -30,20 +30,12 @@ public class LoginApiController {
         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();
-//    }
+    //绑定手机号码
+    @ApiOperation(value="小程序-绑定手机号码", notes="小程序-绑定手机号码")
+    @GetMapping(value = "/bindPhone")
+    public Result<Object> bindPhone(String phoneCode){
+        return loginApiService.bindPhone(phoneCode);
+    }
 
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/UserController.java

@@ -26,15 +26,6 @@ public class UserController {
     private UserService userService;
     /****************************************************************************************************/
 
-    @ApiOperation(value="用户信息-查询个人信息", notes="用户信息-查询个人信息")
-    @RequestMapping(value = "/queryUser", method = {RequestMethod.POST})
-    public Result<?> queryUser(@RequestHeader("X-Access-Token") String token){
-
-        String message = "查询个人信息失败";
-        //注册信息验证
-        return userService.queryUser(token);
-    }
-
     @ApiOperation(value="用户信息-个人注册", notes="用户信息-个人注册")
     @RequestMapping(value = "/addUser", method = {RequestMethod.POST})
     public Result<?> addUser(@RequestHeader("X-Access-Token") String token, UserBean userBean){
@@ -65,34 +56,20 @@ public class UserController {
         return Result.error(message);
     }
 
-    @ApiOperation(value="用户信息-资料修改", notes="用户信息-资料修改")
-    @RequestMapping(value = "/updateUser", method = {RequestMethod.POST})
-    public Result<?> updateUser(@RequestHeader("X-Access-Token") String token, UserBean userBean){
-        //将注册信息注入到实体bean中
-        CarrentUser carrentUser = new CarrentUser();
-        carrentUser.setId(userBean.getId());
-        carrentUser.setName(userBean.getName());
-        carrentUser.setCerNo(userBean.getCerNo());
-        carrentUser.setPhone(userBean.getPhone());
-        carrentUser.setCerImage(userBean.getCerImage());
+    /*****************************************************************************************************************/
+    //查看个人信息
 
-        String message = "";
-        //注册信息验证
-        if(StringUtils.isEmpty(carrentUser.getName())){
-            message = "用户姓名未填写，请填写用户姓名!";
-        }else if(StringUtils.isEmpty(carrentUser.getCerNo())){
-            message = "身份证号码未填写，请填写身份证号码!";
-        }else if(StringUtils.isEmpty(carrentUser.getPhone())){
-            message = "联系方式未填写，请填写联系方式!";
-        }else if(StringUtils.isEmpty(carrentUser.getCerImage())){
-            message = "身份证正面照片未填写，请上传身份证正面照片!";
-        }else {
-            //注册信息无误，进入业务流程处理
-            return userService.updateUser(token, carrentUser);
-        }
+    @ApiOperation(value="用户信息-查看个人信息", notes="用户信息-查看个人信息")
+    @RequestMapping(value = "/queryUser", method = {RequestMethod.GET})
+    public Result<?> queryUser(@RequestHeader("X-Access-Token") String token){
+        return userService.queryUserInfo(token);
+    }
 
-        //注册信息有误，返回错误信息
-        return Result.error(message);
+    //lzx：修改个人信息
+    @ApiOperation(value="用户信息-修改个人信息", notes="用户信息-修改个人信息")
+    @RequestMapping(value = "/updateUser", method = {RequestMethod.POST})
+    public Result<?> updateUser(@RequestHeader("X-Access-Token") String token,String nickName,String phone,String headImage){
+        return userService.updateUserInfo(token, nickName, phone, headImage);
     }
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/WxQrCodeVo.java

@@ -9,6 +9,6 @@ public class WxQrCodeVo {
     @ApiModelProperty(value = "图片地址")
     private String url;
 
-    @ApiModelProperty(value = "加油站名称")
+    @ApiModelProperty(value = "小程序名称")
     private String name;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ConfigService.java

@@ -30,6 +30,12 @@ public interface ConfigService {
      */
     public Result<?> queryCatogoryTwoList(PageBean pageBean);
 
+    /**
+     *获取公里数列表
+     * @return
+     */
+    public Result<?> queryMileageList();
+
     /**
      *
      * @return

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/LoginApiService.java

@@ -7,9 +7,5 @@ public interface LoginApiService {
     //小程序-登录接口
     Result<?> login(LoginReq loginReq);
 
-    //获取用户协议
-    Result<?> getUserAgreement();
-
-    //获取隐私政策
-    Result<?> getPrivacyPolicy();
+    public Result<Object> bindPhone(String phoneCode);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserService.java

@@ -6,27 +6,28 @@ import org.jeecg.modules.carrentUser.entity.CarrentUser;
 public interface UserService {
 
     /**
-     * 用户信息-查询个人信息
+     * 用户信息-个人注册
      * @param token
+     * @param carrentUser 用户信息
      * @return
      */
-    public Result<?> queryUser(String token);
+    public Result<?> addUser(String token, CarrentUser carrentUser);
 
     /**
-     * 用户信息-个人注册
+     * 查询个人信息接口
      * @param token
-     * @param carrentUser 用户信息
      * @return
      */
-    public Result<?> addUser(String token, CarrentUser carrentUser);
-
+    Result<?> queryUserInfo(String token);
 
     /**
-     * 用户信息-资料修改
+     * 修改个人信息接口
      * @param token
-     * @param carrentUser 用户信息
+     * @param nickName
+     * @param phone
+     * @param headImage
      * @return
      */
-    public Result<?> updateUser(String token, CarrentUser carrentUser);
+    Result<?> updateUserInfo(String token,String nickName,String phone,String headImage);
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CompanyServiceImpl.java

@@ -26,33 +26,35 @@ public class CompanyServiceImpl implements CompanyService {
     //企业信息-企业注册
     @Override
     public Result<?> addCompany(String token, CarrentCompany carrentCompany) {
-        //返回信息
-        String message = "企业注册失败";
-        //执行结果
-        boolean result = false;
+        String message = "企业实名注册操作失败";
         //权限验证
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        carrentCompany.setUserId(hanHaiMember.getId());
 
         try{
-            //执行企业注册
-            result = carrentCompanyService.save(carrentCompany);
-
-            //判断执行结果
-            if(result){
-                message = "企业注册成功！";
+            //查询企业信息
+            CarrentCompany company = carrentCompanyService
+                    .lambdaQuery()
+                    .eq(CarrentCompany::getUserId, hanHaiMember.getId())
+                    .one();
+            //如果存在则修改信息
+            if(null != company){
+                if(!"1".equals(company.getStatus())){
+                    company.setId(company.getId());
+                    company.setStatus("0");
+                    carrentCompanyService.updateById(company);
+                    message = "企业实名注册修改成功！";
+                }else {
+                    message = "审核已通过，不能修改！";
+                }
             }else {
-                message = "企业注册失败！";
+                company.setUserId(hanHaiMember.getId());
+                boolean result = carrentCompanyService.save(company);
+                message = "企业实名注册添加成功！";
             }
-
-            //返回执行结果
             return Result.OK(message);
-
         }catch (Exception e){
-            //错误信息打印
             e.printStackTrace();
             return Result.error(message);
         }
-
     }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java

@@ -11,6 +11,8 @@ import org.jeecg.modules.carrentCategorytwo.entity.CarrentCategorytwo;
 import org.jeecg.modules.carrentCategorytwo.service.ICarrentCategorytwoService;
 import org.jeecg.modules.carrentConfig.entity.CarrentConfig;
 import org.jeecg.modules.carrentConfig.service.ICarrentConfigService;
+import org.jeecg.modules.carrentMileage.entity.CarrentMileage;
+import org.jeecg.modules.carrentMileage.service.ICarrentMileageService;
 import org.jeecg.modules.carrentOrder.entity.CarrentOrder;
 import org.jeecg.modules.carrentType.entity.CarrentType;
 import org.jeecg.modules.carrentType.service.ICarrentTypeService;
@@ -24,6 +26,10 @@ import java.util.List;
 public class ConfigServiceImpl implements ConfigService {
 
     /*************************************************************************************/
+    //公里数信息
+    @Resource
+    private ICarrentMileageService carrentMileageService;
+
     //商品类型
     @Resource
     private ICarrentTypeService carrentTypeService;
@@ -176,6 +182,31 @@ public class ConfigServiceImpl implements ConfigService {
 
     }
 
+    //配置信息-获取商品二级分类列表
+    @Override
+    public Result<?> queryMileageList() {
+        //返回信息
+        String message = "公里数列表查询失败!";
+        //公里数列表
+        List<CarrentMileage> mileageList = new ArrayList<>();
+
+        try{
+
+            mileageList = carrentMileageService
+                    .lambdaQuery()
+                    .orderByAsc(CarrentMileage::getMileage)
+                    .list();
+            message = "公里数列表";
+            //返回执行结果
+            return Result.OK(message, mileageList);
+        }catch (Exception e){
+            //错误信息打印
+            e.printStackTrace();
+            return Result.error(message, mileageList);
+        }
+
+    }
+
     //获取隐私政策
     @Override
     public Result<?> queryPrivacy() {

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/LoginApiServiceImpl.java

@@ -20,20 +20,9 @@ public class LoginApiServiceImpl implements LoginApiService {
         return appletLoginService.appletLogin(loginReq);
     }
 
-
-    //小程序-获取用户协议
-    @Override
-    public Result<?> getUserAgreement()
-    {
-
-        return Result.OK("用户协议");
-    }
-
-    //获取隐私政策
+    //微信小程序登录绑定手机号码接口
     @Override
-    public Result<?> getPrivacyPolicy()
-    {
-
-        return Result.OK("隐私政策");
+    public Result<Object> bindPhone(String phoneCode) {
+        return appletLoginService.bindPhone(phoneCode);
     }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/RecommendServiceImpl.java

@@ -46,6 +46,7 @@ public class RecommendServiceImpl implements RecommendService {
     private String accessKey = "LTAI5tPfZo39q2r9Sr5mW84u";
     private String secretKey = "XxExGallsV4O9nERHpVsQg2XtPCU7r";
     private String bucketName = "augcl";
+    private String staticDomain = "https://img.augcl.com/";
     /*************************************************************************************/
 
     //获取个人推荐二维码
@@ -139,8 +140,7 @@ public class RecommendServiceImpl implements RecommendService {
             MultipartFile mf = new CommonsMultipartFile(item);
             //返回图片下载地址
             WxQrCodeVo wxCodeVo = new WxQrCodeVo();
-            wxCodeVo.setUrl(this.uploadAliYunOss(mf));
-
+            wxCodeVo.setUrl(staticDomain+this.uploadAliYunOss(mf));
             wxCodeVo.setName("老环卫欢迎您");
 
             return Result.OK(wxCodeVo);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserServiceImpl.java

@@ -1,14 +1,22 @@
 package org.jeecg.modules.apiService.impl;
 
+import com.alipay.api.domain.Car;
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.apiService.UserService;
+import org.jeecg.modules.carrentCompany.entity.CarrentCompany;
+import org.jeecg.modules.carrentCompany.service.ICarrentCompanyService;
 import org.jeecg.modules.carrentUser.entity.CarrentUser;
 import org.jeecg.modules.carrentUser.service.ICarrentUserService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class UserServiceImpl implements UserService {
@@ -20,126 +28,132 @@ public class UserServiceImpl implements UserService {
 
     //个人信息
     @Resource
+    private IHanHaiMemberService hanHaiMemberService;
+
+    //个人注册信息
+    @Resource
     private ICarrentUserService carrentUserService;
-    /*************************************************************************************/
 
-    //用户信息-根据id查询个人信息
+    //企业注册信息
+    @Resource
+    private ICarrentCompanyService carrentCompanyService;
+    /*************************************************************************************/
+    //用户信息-个人注册
     @Override
-    public Result<?> queryUser(String token) {
+    public Result<?> addUser(String token, CarrentUser carrentUser) {
         //返回信息
-        String message = "查询失败";
+        String message = "个人注册失败！";
         //权限验证
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
         try{
-            //执行查询
-            CarrentUser user = carrentUserService
-                    .lambdaQuery()
+            //查询实名认证信息
+            CarrentUser user = carrentUserService.lambdaQuery()
                     .eq(CarrentUser::getUserId, hanHaiMember.getId())
                     .one();
-            if(null == user){
-                return Result.error("该用户未进行个人注册，请先进行个人注册");
+
+            //判断用户是否已实名认证通过
+            CarrentUser cerNo = carrentUserService.lambdaQuery()
+                    .eq(CarrentUser::getCerNo, user.getCerNo())
+                    .eq(CarrentUser::getStatus, "1")
+                    .one();
+
+            if(null != cerNo){
+                return Result.error("该身份证已认证过，不能重复使用！");
             }
-            //判断执行结果
+
+            //如果存在则修改信息
             if(null != user){
-                message = "个人信息！";
+                if(!"1".equals(user.getStatus())){
+                    user.setId(user.getId());
+                    user.setStatus("0");
+                    carrentUserService.updateById(user);
+                    message = "个人实名注册修改成功！";
+                }else {
+                    message = "审核已通过，不能修改！";
+                }
             }else {
-                message = "没有查询到用户信息！";
+                user.setUserId(hanHaiMember.getId());
+                boolean result = carrentUserService.save(user);
+                message = "个人实名注册添加成功！";
             }
-
-            //返回执行结果
-            return Result.OK(message, user);
-
+            return Result.OK(message);
         }catch (Exception e){
-            //错误信息打印
             e.printStackTrace();
-            return Result.OK(message);
+            return Result.error(message);
         }
 
     }
 
-    //用户信息-个人注册
+    /******************************************************************************************************************/
+    //查询个人信息
     @Override
-    public Result<?> addUser(String token, CarrentUser carrentUser) {
-        //返回信息
-        String message = "个人注册失败";
-        //执行结果
-        boolean result = false;
+    public Result<?> queryUserInfo(String token){
         //权限验证
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        carrentUser.setUserId(hanHaiMember.getId());
+        //返回信息
+        Map map = new HashMap();
 
         try{
+            //用户信息
+            HanHaiMember member = hanHaiMemberService.getById(hanHaiMember.getId());
+            map.put("memberInfo", member);
 
-            //判断是否重复注册
-            CarrentUser user = carrentUserService
+            //获取个人实名信息
+            CarrentUser personAuthenticationStatus = carrentUserService
                     .lambdaQuery()
                     .eq(CarrentUser::getUserId, hanHaiMember.getId())
                     .one();
-            if(null != user){
-                return Result.error("该用户已注册个人信息，请勿重复注册");
+            if(null != personAuthenticationStatus){
+                map.put("personAuthenticationStatus",personAuthenticationStatus.getStatus());//个人实名状态
+            }else {
+                map.put("personAuthenticationStatus","-1");//个人实名状态
             }
 
-            //执行个人注册
-            result = carrentUserService.save(carrentUser);
-
-            //判断执行结果
-            if(result){
-                message = "个人注册成功！";
+            //获取企业实名信息
+            CarrentCompany company = carrentCompanyService
+                    .lambdaQuery()
+                    .eq(CarrentCompany::getUserId, hanHaiMember.getId())
+                    .one();
+            if(null != company){
+                map.put("companyAuthenticationStatus",company.getStatus());//企业实名状态
             }else {
-                message = "个人注册失败！";
+                map.put("companyAuthenticationStatus","-1");//企业实名状态
             }
 
-            //返回执行结果
-            return Result.OK(message);
+            return Result.OK("用户信息", map);
 
         }catch (Exception e){
-            //错误信息打印
             e.printStackTrace();
-            return Result.OK(message);
+            return Result.error("用户信息获取失败", null);
         }
-
     }
 
-    //用户信息-资料修改
+    //修改个人信息
     @Override
-    public Result<?> updateUser(String token, CarrentUser carrentUser) {
-        //返回信息
-        String message = "";
-        //执行结果
-        boolean result = false;
+    public Result<?> updateUserInfo(String token,String nickName,String phone,String headImage){
         //权限验证
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
         try{
-            CarrentUser user = carrentUserService
-                    .lambdaQuery()
-                    .eq(CarrentUser::getUserId, hanHaiMember.getId())
-                    .one();
-            if(null == user){
-                return Result.error("该用户还未进行个人注册，请先去进行个人注册");
+            //用户昵称不能为空
+            if(StringUtils.isBlank(nickName)){
+                return Result.error("用户昵称不能为空");
             }
-
-            //执行资料修改
-            carrentUser.setId(user.getId());
-            carrentUser.setUserId(hanHaiMember.getId());
-            result = carrentUserService.updateById(carrentUser);
-
-            //判断执行结果
-            if(result){
-                message = "个人资料修改成功！";
-            }else {
-                message = "个人资料修改失败！";
+            if(StringUtils.isBlank(headImage)){
+                return Result.error("头像不能为空");
             }
 
-            //返回执行结果
-            return Result.OK(message);
+            hanHaiMember.setNickName(nickName);
+            hanHaiMember.setPhone(phone);
+            hanHaiMember.setHeadImage(headImage);
+            hanHaiMemberService.updateById(hanHaiMember);
 
+            return Result.OK("修改成功");
         }catch (Exception e){
-            //错误信息打印
             e.printStackTrace();
-            return Result.error(message);
+            return Result.error("修改失败");
         }
-
     }
+
 }