1、接口添加

.idea/uiDesigner.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>

.idea/workspace.xml

@@ -1,34 +1,131 @@
 <?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="1、自动生成代码">
+    <list default="true" id="74ae82f3-7b81-42e8-8b53-827e18cc7011" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
+      <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 beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/admin-hanhai-vue/.env" beforeDir="false" afterPath="$PROJECT_DIR$/admin-hanhai-vue/.env" 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$/admin-hanhai-vue/public/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/admin-hanhai-vue/public/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/admin-hanhai-vue/src/components/layouts/TabLayout.vue" beforeDir="false" afterPath="$PROJECT_DIR$/admin-hanhai-vue/src/components/layouts/TabLayout.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/admin-hanhai-vue/src/components/layouts/UserLayout.vue" beforeDir="false" afterPath="$PROJECT_DIR$/admin-hanhai-vue/src/components/layouts/UserLayout.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/admin-hanhai-vue/src/components/page/GlobalHeader.vue" beforeDir="false" afterPath="$PROJECT_DIR$/admin-hanhai-vue/src/components/page/GlobalHeader.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/admin-hanhai-vue/src/components/tools/Logo.vue" beforeDir="false" afterPath="$PROJECT_DIR$/admin-hanhai-vue/src/components/tools/Logo.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java" 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/carrentCar/controller/CarrentCarController.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/carrentCar/entity/CarrentCar.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" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/mapper/CarrentCarMapper.java" 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" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/service/ICarrentCarService.java" afterDir="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" afterPath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/service/impl/CarrentCarServiceImpl.java" afterDir="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/carrentCar/vue/CarrentCarList.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/carrentCar/vue/modules/CarrentCarForm.vue" 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/carrentCar/vue3/CarrentCar.data.ts" 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/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" />
@@ -37,22 +134,23 @@
       <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/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/CarController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/CarController.java" 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-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" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/CarBean.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/CompanyBean.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/CompanyBean.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/OrderBean.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/OrderBean.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/UserBean.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/UserBean.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/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" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CarServiceImpl.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/UserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/resources/application-dev.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/resources/static/generic/web/locale/zh-CN/viewer.properties" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/resources/static/generic/web/locale/zh-CN/viewer.properties" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -115,6 +213,7 @@
     <property name="RequestMappingsPanelWidth0" value="75" />
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <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$/.." />
@@ -129,10 +228,14 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="org.jeecg.modules.apiBean" />
+      <recent name="org.jeecg.modules.service.impl" />
+      <recent name="org.jeecg.modules.service" />
+      <recent name="org.jeecg.modules.apiService.impl" />
+      <recent name="org.jeecg.modules.apiService" />
+      <recent name="org.jeecg.modules.api.carrentController" />
     </key>
   </component>
-  <component name="RunManager">
+  <component name="RunManager" selected="Spring Boot.JeecgSystemApplication">
     <configuration name="JeecgSystemApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
       <module name="jeecg-boot-module-system" />
       <extension name="coverage">
@@ -151,9 +254,20 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
+      <package-json value="$PROJECT_DIR$/admin-hanhai-vue/package.json" />
+      <command value="run" />
+      <scripts>
+        <script value="build" />
+      </scripts>
+      <node-interpreter value="project" />
+      <envs />
+      <method v="2" />
+    </configuration>
     <recent_temporary>
       <list>
         <item itemvalue="Spring Boot.JeecgSystemApplication" />
+        <item itemvalue="npm.build" />
       </list>
     </recent_temporary>
   </component>
@@ -169,7 +283,9 @@
       <updated>1731381532980</updated>
       <workItem from="1731381536345" duration="16690000" />
       <workItem from="1731750561470" duration="9951000" />
-      <workItem from="1733103883735" duration="11089000" />
+      <workItem from="1733103883735" duration="17631000" />
+      <workItem from="1733710180531" duration="11896000" />
+      <workItem from="1733968817518" duration="25748000" />
     </task>
     <task id="LOCAL-00001" summary="1、项目初始化">
       <created>1731385713383</created>
@@ -206,7 +322,28 @@
       <option name="project" value="LOCAL" />
       <updated>1733219056792</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="1、权限验证补充">
+      <created>1733221539299</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1733221539299</updated>
+    </task>
+    <task id="LOCAL-00007" summary="1、接口添加">
+      <created>1733221591234</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1733221591234</updated>
+    </task>
+    <task id="LOCAL-00008" summary="1、登录接口添加">
+      <created>1733880722458</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1733880722458</updated>
+    </task>
+    <option name="localTasksCounter" value="9" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -232,96 +369,118 @@
     <MESSAGE value="1、自动生成代码" />
     <MESSAGE value="1、企业信息相关接口添加&#10;2、个人信息相关接口添加&#10;3、商品信息相关接口添加&#10;4、新闻信息相关接口添加&#10;5、预约信息相关接口添加" />
     <MESSAGE value="1、权限验证添加" />
-    <option name="LAST_COMMIT_MESSAGE" value="1、权限验证添加" />
+    <MESSAGE value="1、权限验证补充" />
+    <MESSAGE value="1、接口添加" />
+    <MESSAGE value="1、登录接口添加" />
+    <option name="LAST_COMMIT_MESSAGE" value="1、登录接口添加" />
   </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="1733219862170">
+    <state x="1085" y="408" key="#com.intellij.ide.util.MemberChooser" timestamp="1734421446278">
       <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="1733219862170" />
+    <state x="1085" y="408" key="#com.intellij.ide.util.MemberChooser/0.0.2560.1400@0.0.2560.1400" timestamp="1734421446278" />
     <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>
     <state x="911" y="566" width="737" height="272" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes/0.0.2560.1400@0.0.2560.1400" timestamp="1733193951942" />
-    <state x="713" y="297" key="CommitChangelistDialog2" timestamp="1733221538743">
+    <state x="1010" y="449" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1733992136886">
+      <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">
       <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="1733221538743" />
-    <state x="184" y="122" width="2048" height="1148" key="DiffContextDialog" timestamp="1733221525681">
+    <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">
       <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="1733221525681" />
-    <state width="2517" height="492" key="GridCell.Tab.0.bottom" timestamp="1733221188329">
+    <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">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="492" key="GridCell.Tab.0.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1733221188329" />
-    <state width="2517" height="492" key="GridCell.Tab.0.center" timestamp="1733221188329">
+    <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">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="492" key="GridCell.Tab.0.center/0.0.2560.1400@0.0.2560.1400" timestamp="1733221188329" />
-    <state width="2517" height="492" key="GridCell.Tab.0.left" timestamp="1733221188329">
+    <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">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="492" key="GridCell.Tab.0.left/0.0.2560.1400@0.0.2560.1400" timestamp="1733221188329" />
-    <state width="2517" height="492" key="GridCell.Tab.0.right" timestamp="1733221188329">
+    <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">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="492" key="GridCell.Tab.0.right/0.0.2560.1400@0.0.2560.1400" timestamp="1733221188329" />
-    <state width="2517" height="492" key="GridCell.Tab.1.bottom" timestamp="1733221188232">
+    <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">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="492" key="GridCell.Tab.1.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1733221188232" />
-    <state width="2517" height="492" key="GridCell.Tab.1.center" timestamp="1733221188232">
+    <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">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="492" key="GridCell.Tab.1.center/0.0.2560.1400@0.0.2560.1400" timestamp="1733221188232" />
-    <state width="2517" height="492" key="GridCell.Tab.1.left" timestamp="1733221188231">
+    <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">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="492" key="GridCell.Tab.1.left/0.0.2560.1400@0.0.2560.1400" timestamp="1733221188231" />
-    <state width="2517" height="492" key="GridCell.Tab.1.right" timestamp="1733221188232">
+    <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">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="492" key="GridCell.Tab.1.right/0.0.2560.1400@0.0.2560.1400" timestamp="1733221188232" />
-    <state width="2517" height="492" key="GridCell.Tab.2.bottom" timestamp="1733221188232">
+    <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">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="492" key="GridCell.Tab.2.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1733221188232" />
-    <state width="2517" height="492" key="GridCell.Tab.2.center" timestamp="1733221188232">
+    <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">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="492" key="GridCell.Tab.2.center/0.0.2560.1400@0.0.2560.1400" timestamp="1733221188232" />
-    <state width="2517" height="492" key="GridCell.Tab.2.left" timestamp="1733221188232">
+    <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">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="492" key="GridCell.Tab.2.left/0.0.2560.1400@0.0.2560.1400" timestamp="1733221188232" />
-    <state width="2517" height="492" key="GridCell.Tab.2.right" timestamp="1733221188232">
+    <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">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="2517" height="492" key="GridCell.Tab.2.right/0.0.2560.1400@0.0.2560.1400" timestamp="1733221188232" />
+    <state width="2500" height="488" key="GridCell.Tab.2.right/0.0.2560.1400@0.0.2560.1400" timestamp="1734423358980" />
     <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="1733221541603">
+    <state x="872" y="436" key="Vcs.Push.Dialog.v2" timestamp="1733880726770">
       <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="1733221541603" />
+    <state x="872" y="436" key="Vcs.Push.Dialog.v2/0.0.2560.1400@0.0.2560.1400" timestamp="1733880726770" />
     <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="1733194018820">
+    <state x="900" y="426" width="759" height="548" key="find.popup" timestamp="1734000391241">
       <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="1733194018820" />
-    <state x="943" y="315" width="672" height="678" key="search.everywhere.popup" timestamp="1733212505008">
+    <state x="900" y="426" width="759" height="548" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1734000391241" />
+    <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="943" y="315" width="672" height="678" key="search.everywhere.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1733212505008" />
+    <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">
+      <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" />
+  </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>
+          <option name="timeStamp" value="6" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
   </component>
 </project>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/controller/CarrentCategoryController.java → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/controller/CarrentApplyController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.carrentCategory.controller;
+package org.jeecg.modules.carrentApply.controller;
 
 import java.util.Arrays;
 import java.util.List;
@@ -12,8 +12,8 @@ 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.carrentCategory.entity.CarrentCategory;
-import org.jeecg.modules.carrentCategory.service.ICarrentCategoryService;
+import org.jeecg.modules.carrentApply.entity.CarrentApply;
+import org.jeecg.modules.carrentApply.service.ICarrentApplyService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -37,66 +37,66 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 
  /**
- * @Description: 分类表
+ * @Description: 寻车申请表
  * @Author: jeecg-boot
- * @Date:   2024-11-12
+ * @Date:   2024-12-12
  * @Version: V1.0
  */
-@Api(tags="分类表")
+@Api(tags="寻车申请表")
 @RestController
-@RequestMapping("/carrentCategory/carrentCategory")
+@RequestMapping("/carrentApply/carrentApply")
 @Slf4j
-public class CarrentCategoryController extends JeecgController<CarrentCategory, ICarrentCategoryService> {
+public class CarrentApplyController extends JeecgController<CarrentApply, ICarrentApplyService> {
 	@Autowired
-	private ICarrentCategoryService carrentCategoryService;
+	private ICarrentApplyService carrentApplyService;
 	
 	/**
 	 * 分页列表查询
 	 *
-	 * @param carrentCategory
+	 * @param carrentApply
 	 * @param pageNo
 	 * @param pageSize
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "分类表-分页列表查询")
-	@ApiOperation(value="分类表-分页列表查询", notes="分类表-分页列表查询")
+	//@AutoLog(value = "寻车申请表-分页列表查询")
+	@ApiOperation(value="寻车申请表-分页列表查询", notes="寻车申请表-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<CarrentCategory>> queryPageList(CarrentCategory carrentCategory,
+	public Result<IPage<CarrentApply>> queryPageList(CarrentApply carrentApply,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<CarrentCategory> queryWrapper = QueryGenerator.initQueryWrapper(carrentCategory, req.getParameterMap());
-		Page<CarrentCategory> page = new Page<CarrentCategory>(pageNo, pageSize);
-		IPage<CarrentCategory> pageList = carrentCategoryService.page(page, queryWrapper);
+		QueryWrapper<CarrentApply> queryWrapper = QueryGenerator.initQueryWrapper(carrentApply, req.getParameterMap());
+		Page<CarrentApply> page = new Page<CarrentApply>(pageNo, pageSize);
+		IPage<CarrentApply> pageList = carrentApplyService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
 	
 	/**
 	 *   添加
 	 *
-	 * @param carrentCategory
+	 * @param carrentApply
 	 * @return
 	 */
-	@AutoLog(value = "分类表-添加")
-	@ApiOperation(value="分类表-添加", notes="分类表-添加")
+	@AutoLog(value = "寻车申请表-添加")
+	@ApiOperation(value="寻车申请表-添加", notes="寻车申请表-添加")
 	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody CarrentCategory carrentCategory) {
-		carrentCategoryService.save(carrentCategory);
+	public Result<String> add(@RequestBody CarrentApply carrentApply) {
+		carrentApplyService.save(carrentApply);
 		return Result.OK("添加成功！");
 	}
 	
 	/**
 	 *  编辑
 	 *
-	 * @param carrentCategory
+	 * @param carrentApply
 	 * @return
 	 */
-	@AutoLog(value = "分类表-编辑")
-	@ApiOperation(value="分类表-编辑", notes="分类表-编辑")
+	@AutoLog(value = "寻车申请表-编辑")
+	@ApiOperation(value="寻车申请表-编辑", notes="寻车申请表-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody CarrentCategory carrentCategory) {
-		carrentCategoryService.updateById(carrentCategory);
+	public Result<String> edit(@RequestBody CarrentApply carrentApply) {
+		carrentApplyService.updateById(carrentApply);
 		return Result.OK("编辑成功!");
 	}
 	
@@ -106,11 +106,11 @@ public class CarrentCategoryController extends JeecgController<CarrentCategory,
 	 * @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) {
-		carrentCategoryService.removeById(id);
+		carrentApplyService.removeById(id);
 		return Result.OK("删除成功!");
 	}
 	
@@ -120,11 +120,11 @@ public class CarrentCategoryController extends JeecgController<CarrentCategory,
 	 * @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.carrentCategoryService.removeByIds(Arrays.asList(ids.split(",")));
+		this.carrentApplyService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
 	
@@ -134,26 +134,26 @@ public class CarrentCategoryController extends JeecgController<CarrentCategory,
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "分类表-通过id查询")
-	@ApiOperation(value="分类表-通过id查询", notes="分类表-通过id查询")
+	//@AutoLog(value = "寻车申请表-通过id查询")
+	@ApiOperation(value="寻车申请表-通过id查询", notes="寻车申请表-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<CarrentCategory> queryById(@RequestParam(name="id",required=true) String id) {
-		CarrentCategory carrentCategory = carrentCategoryService.getById(id);
-		if(carrentCategory==null) {
+	public Result<CarrentApply> queryById(@RequestParam(name="id",required=true) String id) {
+		CarrentApply carrentApply = carrentApplyService.getById(id);
+		if(carrentApply==null) {
 			return Result.error("未找到对应数据");
 		}
-		return Result.OK(carrentCategory);
+		return Result.OK(carrentApply);
 	}
 
     /**
     * 导出excel
     *
     * @param request
-    * @param carrentCategory
+    * @param carrentApply
     */
     @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, CarrentCategory carrentCategory) {
-        return super.exportXls(request, carrentCategory, CarrentCategory.class, "分类表");
+    public ModelAndView exportXls(HttpServletRequest request, CarrentApply carrentApply) {
+        return super.exportXls(request, carrentApply, CarrentApply.class, "寻车申请表");
     }
 
     /**
@@ -165,7 +165,7 @@ public class CarrentCategoryController extends JeecgController<CarrentCategory,
     */
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, CarrentCategory.class);
+        return super.importExcel(request, response, CarrentApply.class);
     }
 
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/entity/CarrentApply.java

@@ -0,0 +1,86 @@
+package org.jeecg.modules.carrentApply.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-12
+ * @Version: V1.0
+ */
+@Data
+@TableName("carrent_apply")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="carrent_apply对象", description="寻车申请表")
+public class CarrentApply 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;
+	/**关联二级分类id*/
+	@Excel(name = "关联二级分类id", width = 15, dictTable = "carrent_categorytwo", dicText = "name", dicCode = "id")
+	@Dict(dictTable = "carrent_categorytwo", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "关联二级分类id")
+    private java.lang.String categorytwoId;
+	/**车辆型号*/
+	@Excel(name = "车辆型号", width = 15)
+    @ApiModelProperty(value = "车辆型号")
+    private java.lang.String model;
+	/**年限*/
+	@Excel(name = "年限", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "年限")
+    private java.util.Date carTime;
+	/**公里数*/
+	@Excel(name = "公里数", width = 15)
+    @ApiModelProperty(value = "公里数")
+    private java.lang.Integer mileage;
+	/**联系人*/
+	@Excel(name = "联系人", width = 15)
+    @ApiModelProperty(value = "联系人")
+    private java.lang.String name;
+	/**联系电话*/
+	@Excel(name = "联系电话", width = 15)
+    @ApiModelProperty(value = "联系电话")
+    private java.lang.String phone;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
+	/**关联用户*/
+	@Excel(name = "关联用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+    @ApiModelProperty(value = "关联用户")
+    private java.lang.String userId;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/mapper/CarrentApplyMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.carrentApply.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.carrentApply.entity.CarrentApply;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 寻车申请表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-12
+ * @Version: V1.0
+ */
+public interface CarrentApplyMapper extends BaseMapper<CarrentApply> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/mapper/xml/CarrentAreaMapper.xml → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/mapper/xml/CarrentApplyMapper.xml

@@ -1,5 +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.carrentArea.mapper.CarrentAreaMapper">
+<mapper namespace="org.jeecg.modules.carrentApply.mapper.CarrentApplyMapper">
 
 </mapper>

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.carrentApply.service;
+
+import org.jeecg.modules.carrentApply.entity.CarrentApply;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 寻车申请表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-12
+ * @Version: V1.0
+ */
+public interface ICarrentApplyService extends IService<CarrentApply> {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.carrentApply.service.impl;
+
+import org.jeecg.modules.carrentApply.entity.CarrentApply;
+import org.jeecg.modules.carrentApply.mapper.CarrentApplyMapper;
+import org.jeecg.modules.carrentApply.service.ICarrentApplyService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 寻车申请表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-12
+ * @Version: V1.0
+ */
+@Service
+public class CarrentApplyServiceImpl extends ServiceImpl<CarrentApplyMapper, CarrentApply> implements ICarrentApplyService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/CarrentApplyList.vue

@@ -0,0 +1,217 @@
+<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-apply-modal ref="modalForm" @ok="modalFormOk"></carrent-apply-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CarrentApplyModal from './modules/CarrentApplyModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'CarrentApplyList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CarrentApplyModal
+    },
+    data () {
+      return {
+        description: '寻车申请表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'关联二级分类id',
+            align:"center",
+            dataIndex: 'categorytwoId_dictText'
+          },
+          {
+            title:'车辆型号',
+            align:"center",
+            dataIndex: 'model'
+          },
+          {
+            title:'年限',
+            align:"center",
+            dataIndex: 'carTime',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title:'公里数',
+            align:"center",
+            dataIndex: 'mileage'
+          },
+          {
+            title:'联系人',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'联系电话',
+            align:"center",
+            dataIndex: 'phone'
+          },
+          {
+            title:'备注',
+            align:"center",
+            dataIndex: 'remark'
+          },
+          {
+            title:'关联用户',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/carrentApply/carrentApply/list",
+          delete: "/carrentApply/carrentApply/delete",
+          deleteBatch: "/carrentApply/carrentApply/deleteBatch",
+          exportXlsUrl: "/carrentApply/carrentApply/exportXls",
+          importExcelUrl: "carrentApply/carrentApply/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'categorytwoId',text:'关联二级分类id',dictCode:"carrent_categorytwo,name,id"})
+        fieldList.push({type:'string',value:'model',text:'车辆型号',dictCode:''})
+        fieldList.push({type:'date',value:'carTime',text:'年限'})
+        fieldList.push({type:'int',value:'mileage',text:'公里数',dictCode:''})
+        fieldList.push({type:'string',value:'name',text:'联系人',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'联系电话',dictCode:''})
+        fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
+        fieldList.push({type:'string',value:'userId',text:'关联用户',dictCode:"han_hai_member,nick_name,id"})
+        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/carrentApply/vue/modules/CarrentApplyForm.vue

@@ -0,0 +1,139 @@
+<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="关联二级分类id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="categorytwoId">
+              <j-dict-select-tag type="list" v-model="model.categorytwoId" dictCode="carrent_categorytwo,name,id" placeholder="请选择关联二级分类id" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="车辆型号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="model">
+              <a-input v-model="model.model" placeholder="请输入车辆型号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="年限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="carTime">
+              <j-date placeholder="请选择年限" v-model="model.carTime"  style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <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-col :span="24">
+            <a-form-model-item label="联系人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" placeholder="请输入联系人"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="联系电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
+              <a-input v-model="model.phone" placeholder="请输入联系电话"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
+              <a-input v-model="model.remark" 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="请选择关联用户" />
+            </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: 'CarrentApplyForm',
+    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: "/carrentApply/carrentApply/add",
+          edit: "/carrentApply/carrentApply/edit",
+          queryById: "/carrentApply/carrentApply/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/carrentArea/vue/modules/CarrentAreaModal.Style#Drawer.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/modules/CarrentApplyModal.Style#Drawer.vue

@@ -7,7 +7,7 @@
     @close="close"
     destroyOnClose
     :visible="visible">
-    <carrent-area-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></carrent-area-form>
+    <carrent-apply-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></carrent-apply-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>
@@ -17,12 +17,12 @@
 
 <script>
 
-  import CarrentAreaForm from './CarrentAreaForm'
+  import CarrentApplyForm from './CarrentApplyForm'
 
   export default {
-    name: 'CarrentAreaModal',
+    name: 'CarrentApplyModal',
     components: {
-      CarrentAreaForm
+      CarrentApplyForm
     },
     data () {
       return {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue/modules/CarrentAreaModal.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/modules/CarrentApplyModal.vue

@@ -8,17 +8,17 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <carrent-area-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></carrent-area-form>
+    <carrent-apply-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></carrent-apply-form>
   </j-modal>
 </template>
 
 <script>
 
-  import CarrentAreaForm from './CarrentAreaForm'
+  import CarrentApplyForm from './CarrentApplyForm'
   export default {
-    name: 'CarrentAreaModal',
+    name: 'CarrentApplyModal',
     components: {
-      CarrentAreaForm
+      CarrentApplyForm
     },
     data () {
       return {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue3/CarrentCar.api.ts → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue3/CarrentApply.api.ts

@@ -2,13 +2,13 @@ import {defHttp} from '/@/utils/http/axios';
 import {Modal} from 'ant-design-vue';
 
 enum Api {
-  list = '/carrentCar/carrentCar/list',
-  save='/carrentCar/carrentCar/add',
-  edit='/carrentCar/carrentCar/edit',
-  deleteOne = '/carrentCar/carrentCar/delete',
-  deleteBatch = '/carrentCar/carrentCar/deleteBatch',
-  importExcel = '/carrentCar/carrentCar/importExcel',
-  exportXls = '/carrentCar/carrentCar/exportXls',
+  list = '/carrentApply/carrentApply/list',
+  save='/carrentApply/carrentApply/add',
+  edit='/carrentApply/carrentApply/edit',
+  deleteOne = '/carrentApply/carrentApply/delete',
+  deleteBatch = '/carrentApply/carrentApply/deleteBatch',
+  importExcel = '/carrentApply/carrentApply/importExcel',
+  exportXls = '/carrentApply/carrentApply/exportXls',
 }
 /**
  * 导出api

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue3/CarrentApply.data.ts

@@ -0,0 +1,102 @@
+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: '关联二级分类id',
+    align:"center",
+    dataIndex: 'categorytwoId_dictText'
+   },
+   {
+    title: '车辆型号',
+    align:"center",
+    dataIndex: 'model'
+   },
+   {
+    title: '年限',
+    align:"center",
+    dataIndex: 'carTime',
+    customRender:({text}) =>{
+      return !text?"":(text.length>10?text.substr(0,10):text)
+    },
+   },
+   {
+    title: '公里数',
+    align:"center",
+    dataIndex: 'mileage'
+   },
+   {
+    title: '联系人',
+    align:"center",
+    dataIndex: 'name'
+   },
+   {
+    title: '联系电话',
+    align:"center",
+    dataIndex: 'phone'
+   },
+   {
+    title: '备注',
+    align:"center",
+    dataIndex: 'remark'
+   },
+   {
+    title: '关联用户',
+    align:"center",
+    dataIndex: 'userId_dictText'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '关联二级分类id',
+    field: 'categorytwoId',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"carrent_categorytwo,name,id"
+     },
+  },
+  {
+    label: '车辆型号',
+    field: 'model',
+    component: 'Input',
+  },
+  {
+    label: '年限',
+    field: 'carTime',
+    component: 'DatePicker',
+  },
+  {
+    label: '公里数',
+    field: 'mileage',
+    component: 'InputNumber',
+  },
+  {
+    label: '联系人',
+    field: 'name',
+    component: 'Input',
+  },
+  {
+    label: '联系电话',
+    field: 'phone',
+    component: 'Input',
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    component: 'Input',
+  },
+  {
+    label: '关联用户',
+    field: 'userId',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"han_hai_member,nick_name,id"
+     },
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue3/CarrentCarList.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue3/CarrentApplyList.vue

@@ -35,25 +35,25 @@
       </template>
     </BasicTable>
     <!-- 表单区域 -->
-    <CarrentCarModal @register="registerModal" @success="handleSuccess"></CarrentCarModal>
+    <CarrentApplyModal @register="registerModal" @success="handleSuccess"></CarrentApplyModal>
   </div>
 </template>
 
-<script lang="ts" name="carrentCar-carrentCar" setup>
+<script lang="ts" name="carrentApply-carrentApply" 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 CarrentCarModal from './components/CarrentCarModal.vue'
-  import {columns, searchFormSchema} from './carrentCar.data';
-  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './carrentCar.api';
+  import CarrentApplyModal from './components/CarrentApplyModal.vue'
+  import {columns, searchFormSchema} from './carrentApply.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './carrentApply.api';
   const checkedKeys = ref<Array<string | number>>([]);
   //注册model
   const [registerModal, {openModal}] = useModal();
   //注册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/carrentCar/vue3/components/CarrentCarModal.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue3/components/CarrentApplyModal.vue

@@ -8,8 +8,8 @@
     import {ref, computed, unref} from 'vue';
     import {BasicModal, useModalInner} from '/@/components/Modal';
     import {BasicForm, useForm} from '/@/components/Form/index';
-    import {formSchema} from '../carrentCar.data';
-    import {saveOrUpdate} from '../carrentCar.api';
+    import {formSchema} from '../carrentApply.data';
+    import {saveOrUpdate} from '../carrentApply.api';
     // Emits声明
     const emit = defineEmits(['register','success']);
     const isUpdate = ref(true);

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/mapper/CarrentAreaMapper.java

@@ -1,17 +0,0 @@
-package org.jeecg.modules.carrentArea.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.carrentArea.entity.CarrentArea;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 区域表
- * @Author: jeecg-boot
- * @Date:   2024-11-12
- * @Version: V1.0
- */
-public interface CarrentAreaMapper extends BaseMapper<CarrentArea> {
-
-}

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

@@ -1,14 +0,0 @@
-package org.jeecg.modules.carrentArea.service;
-
-import org.jeecg.modules.carrentArea.entity.CarrentArea;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 区域表
- * @Author: jeecg-boot
- * @Date:   2024-11-12
- * @Version: V1.0
- */
-public interface ICarrentAreaService extends IService<CarrentArea> {
-
-}

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

@@ -1,19 +0,0 @@
-package org.jeecg.modules.carrentArea.service.impl;
-
-import org.jeecg.modules.carrentArea.entity.CarrentArea;
-import org.jeecg.modules.carrentArea.mapper.CarrentAreaMapper;
-import org.jeecg.modules.carrentArea.service.ICarrentAreaService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 区域表
- * @Author: jeecg-boot
- * @Date:   2024-11-12
- * @Version: V1.0
- */
-@Service
-public class CarrentAreaServiceImpl extends ServiceImpl<CarrentAreaMapper, CarrentArea> implements ICarrentAreaService {
-
-}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/mapper/CarrentCarMapper.java

@@ -1,17 +0,0 @@
-package org.jeecg.modules.carrentCar.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.carrentCar.entity.CarrentCar;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 车辆信息表
- * @Author: jeecg-boot
- * @Date:   2024-12-03
- * @Version: V1.0
- */
-public interface CarrentCarMapper extends BaseMapper<CarrentCar> {
-
-}

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

@@ -1,14 +0,0 @@
-package org.jeecg.modules.carrentCar.service;
-
-import org.jeecg.modules.carrentCar.entity.CarrentCar;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 车辆信息表
- * @Author: jeecg-boot
- * @Date:   2024-12-03
- * @Version: V1.0
- */
-public interface ICarrentCarService extends IService<CarrentCar> {
-
-}

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

@@ -1,19 +0,0 @@
-package org.jeecg.modules.carrentCar.service.impl;
-
-import org.jeecg.modules.carrentCar.entity.CarrentCar;
-import org.jeecg.modules.carrentCar.mapper.CarrentCarMapper;
-import org.jeecg.modules.carrentCar.service.ICarrentCarService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 车辆信息表
- * @Author: jeecg-boot
- * @Date:   2024-12-03
- * @Version: V1.0
- */
-@Service
-public class CarrentCarServiceImpl extends ServiceImpl<CarrentCarMapper, CarrentCar> implements ICarrentCarService {
-
-}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/mapper/CarrentCategoryMapper.java

@@ -1,17 +0,0 @@
-package org.jeecg.modules.carrentCategory.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.carrentCategory.entity.CarrentCategory;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 分类表
- * @Author: jeecg-boot
- * @Date:   2024-11-12
- * @Version: V1.0
- */
-public interface CarrentCategoryMapper extends BaseMapper<CarrentCategory> {
-
-}

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

@@ -1,14 +0,0 @@
-package org.jeecg.modules.carrentCategory.service;
-
-import org.jeecg.modules.carrentCategory.entity.CarrentCategory;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 分类表
- * @Author: jeecg-boot
- * @Date:   2024-11-12
- * @Version: V1.0
- */
-public interface ICarrentCategoryService extends IService<CarrentCategory> {
-
-}

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

@@ -1,19 +0,0 @@
-package org.jeecg.modules.carrentCategory.service.impl;
-
-import org.jeecg.modules.carrentCategory.entity.CarrentCategory;
-import org.jeecg.modules.carrentCategory.mapper.CarrentCategoryMapper;
-import org.jeecg.modules.carrentCategory.service.ICarrentCategoryService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 分类表
- * @Author: jeecg-boot
- * @Date:   2024-11-12
- * @Version: V1.0
- */
-@Service
-public class CarrentCategoryServiceImpl extends ServiceImpl<CarrentCategoryMapper, CarrentCategory> implements ICarrentCategoryService {
-
-}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/controller/CarrentComponentController.java → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategoryone/controller/CarrentCategoryoneController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.carrentComponent.controller;
+package org.jeecg.modules.carrentCategoryone.controller;
 
 import java.util.Arrays;
 import java.util.List;
@@ -12,8 +12,8 @@ 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.carrentComponent.entity.CarrentComponent;
-import org.jeecg.modules.carrentComponent.service.ICarrentComponentService;
+import org.jeecg.modules.carrentCategoryone.entity.CarrentCategoryone;
+import org.jeecg.modules.carrentCategoryone.service.ICarrentCategoryoneService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -37,66 +37,66 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 
  /**
- * @Description: 设备部件表
+ * @Description: 商品一级分类
  * @Author: jeecg-boot
- * @Date:   2024-11-12
+ * @Date:   2024-12-12
  * @Version: V1.0
  */
-@Api(tags="设备部件表")
+@Api(tags="商品一级分类")
 @RestController
-@RequestMapping("/carrentComponent/carrentComponent")
+@RequestMapping("/carrentCategoryone/carrentCategoryone")
 @Slf4j
-public class CarrentComponentController extends JeecgController<CarrentComponent, ICarrentComponentService> {
+public class CarrentCategoryoneController extends JeecgController<CarrentCategoryone, ICarrentCategoryoneService> {
 	@Autowired
-	private ICarrentComponentService carrentComponentService;
+	private ICarrentCategoryoneService carrentCategoryoneService;
 	
 	/**
 	 * 分页列表查询
 	 *
-	 * @param carrentComponent
+	 * @param carrentCategoryone
 	 * @param pageNo
 	 * @param pageSize
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "设备部件表-分页列表查询")
-	@ApiOperation(value="设备部件表-分页列表查询", notes="设备部件表-分页列表查询")
+	//@AutoLog(value = "商品一级分类-分页列表查询")
+	@ApiOperation(value="商品一级分类-分页列表查询", notes="商品一级分类-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<CarrentComponent>> queryPageList(CarrentComponent carrentComponent,
+	public Result<IPage<CarrentCategoryone>> queryPageList(CarrentCategoryone carrentCategoryone,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<CarrentComponent> queryWrapper = QueryGenerator.initQueryWrapper(carrentComponent, req.getParameterMap());
-		Page<CarrentComponent> page = new Page<CarrentComponent>(pageNo, pageSize);
-		IPage<CarrentComponent> pageList = carrentComponentService.page(page, queryWrapper);
+		QueryWrapper<CarrentCategoryone> queryWrapper = QueryGenerator.initQueryWrapper(carrentCategoryone, req.getParameterMap());
+		Page<CarrentCategoryone> page = new Page<CarrentCategoryone>(pageNo, pageSize);
+		IPage<CarrentCategoryone> pageList = carrentCategoryoneService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
 	
 	/**
 	 *   添加
 	 *
-	 * @param carrentComponent
+	 * @param carrentCategoryone
 	 * @return
 	 */
-	@AutoLog(value = "设备部件表-添加")
-	@ApiOperation(value="设备部件表-添加", notes="设备部件表-添加")
+	@AutoLog(value = "商品一级分类-添加")
+	@ApiOperation(value="商品一级分类-添加", notes="商品一级分类-添加")
 	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody CarrentComponent carrentComponent) {
-		carrentComponentService.save(carrentComponent);
+	public Result<String> add(@RequestBody CarrentCategoryone carrentCategoryone) {
+		carrentCategoryoneService.save(carrentCategoryone);
 		return Result.OK("添加成功！");
 	}
 	
 	/**
 	 *  编辑
 	 *
-	 * @param carrentComponent
+	 * @param carrentCategoryone
 	 * @return
 	 */
-	@AutoLog(value = "设备部件表-编辑")
-	@ApiOperation(value="设备部件表-编辑", notes="设备部件表-编辑")
+	@AutoLog(value = "商品一级分类-编辑")
+	@ApiOperation(value="商品一级分类-编辑", notes="商品一级分类-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody CarrentComponent carrentComponent) {
-		carrentComponentService.updateById(carrentComponent);
+	public Result<String> edit(@RequestBody CarrentCategoryone carrentCategoryone) {
+		carrentCategoryoneService.updateById(carrentCategoryone);
 		return Result.OK("编辑成功!");
 	}
 	
@@ -106,11 +106,11 @@ public class CarrentComponentController extends JeecgController<CarrentComponent
 	 * @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) {
-		carrentComponentService.removeById(id);
+		carrentCategoryoneService.removeById(id);
 		return Result.OK("删除成功!");
 	}
 	
@@ -120,11 +120,11 @@ public class CarrentComponentController extends JeecgController<CarrentComponent
 	 * @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.carrentComponentService.removeByIds(Arrays.asList(ids.split(",")));
+		this.carrentCategoryoneService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
 	
@@ -134,26 +134,26 @@ public class CarrentComponentController extends JeecgController<CarrentComponent
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "设备部件表-通过id查询")
-	@ApiOperation(value="设备部件表-通过id查询", notes="设备部件表-通过id查询")
+	//@AutoLog(value = "商品一级分类-通过id查询")
+	@ApiOperation(value="商品一级分类-通过id查询", notes="商品一级分类-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<CarrentComponent> queryById(@RequestParam(name="id",required=true) String id) {
-		CarrentComponent carrentComponent = carrentComponentService.getById(id);
-		if(carrentComponent==null) {
+	public Result<CarrentCategoryone> queryById(@RequestParam(name="id",required=true) String id) {
+		CarrentCategoryone carrentCategoryone = carrentCategoryoneService.getById(id);
+		if(carrentCategoryone==null) {
 			return Result.error("未找到对应数据");
 		}
-		return Result.OK(carrentComponent);
+		return Result.OK(carrentCategoryone);
 	}
 
     /**
     * 导出excel
     *
     * @param request
-    * @param carrentComponent
+    * @param carrentCategoryone
     */
     @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, CarrentComponent carrentComponent) {
-        return super.exportXls(request, carrentComponent, CarrentComponent.class, "设备部件表");
+    public ModelAndView exportXls(HttpServletRequest request, CarrentCategoryone carrentCategoryone) {
+        return super.exportXls(request, carrentCategoryone, CarrentCategoryone.class, "商品一级分类");
     }
 
     /**
@@ -165,7 +165,7 @@ public class CarrentComponentController extends JeecgController<CarrentComponent
     */
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, CarrentComponent.class);
+        return super.importExcel(request, response, CarrentCategoryone.class);
     }
 
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/entity/CarrentComponent.java → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategoryone/entity/CarrentCategoryone.java

@@ -1,14 +1,18 @@
-package org.jeecg.modules.carrentComponent.entity;
+package org.jeecg.modules.carrentCategoryone.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.carrentCategorytwo.entity.CarrentCategorytwo;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -18,17 +22,17 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @Description: 设备部件表
+ * @Description: 商品一级分类
  * @Author: jeecg-boot
- * @Date:   2024-11-12
+ * @Date:   2024-12-12
  * @Version: V1.0
  */
 @Data
-@TableName("carrent_component")
+@TableName("carrent_categoryone")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="carrent_component对象", description="设备部件表")
-public class CarrentComponent implements Serializable {
+@ApiModel(value="carrent_categoryone对象", description="商品一级分类")
+public class CarrentCategoryone implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键*/
@@ -47,8 +51,12 @@ public class CarrentComponent implements Serializable {
 	/**更新日期*/
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
-	/**部件名称*/
-	@Excel(name = "部件名称", width = 15)
-    @ApiModelProperty(value = "部件名称")
+	/**一级分类名称*/
+	@Excel(name = "一级分类名称", width = 15)
+    @ApiModelProperty(value = "一级分类名称")
     private java.lang.String name;
+
+    //二级分类列表
+    @TableField(exist = false)
+    private List<CarrentCategorytwo> carrentCategorytwoList;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategoryone/mapper/CarrentCategoryoneMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.carrentCategoryone.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.carrentCategoryone.entity.CarrentCategoryone;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 商品一级分类
+ * @Author: jeecg-boot
+ * @Date:   2024-12-12
+ * @Version: V1.0
+ */
+public interface CarrentCategoryoneMapper extends BaseMapper<CarrentCategoryone> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/mapper/xml/CarrentComponentMapper.xml → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategoryone/mapper/xml/CarrentCategoryoneMapper.xml

@@ -1,5 +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.carrentComponent.mapper.CarrentComponentMapper">
+<mapper namespace="org.jeecg.modules.carrentCategoryone.mapper.CarrentCategoryoneMapper">
 
 </mapper>

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.carrentCategoryone.service;
+
+import org.jeecg.modules.carrentCategoryone.entity.CarrentCategoryone;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 商品一级分类
+ * @Author: jeecg-boot
+ * @Date:   2024-12-12
+ * @Version: V1.0
+ */
+public interface ICarrentCategoryoneService extends IService<CarrentCategoryone> {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.carrentCategoryone.service.impl;
+
+import org.jeecg.modules.carrentCategoryone.entity.CarrentCategoryone;
+import org.jeecg.modules.carrentCategoryone.mapper.CarrentCategoryoneMapper;
+import org.jeecg.modules.carrentCategoryone.service.ICarrentCategoryoneService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 商品一级分类
+ * @Author: jeecg-boot
+ * @Date:   2024-12-12
+ * @Version: V1.0
+ */
+@Service
+public class CarrentCategoryoneServiceImpl extends ServiceImpl<CarrentCategoryoneMapper, CarrentCategoryone> implements ICarrentCategoryoneService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue/CarrentComponentList.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategoryone/vue/CarrentCategoryoneList.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>
@@ -89,7 +89,7 @@
       </a-table>
     </div>
 
-    <carrent-component-modal ref="modalForm" @ok="modalFormOk"></carrent-component-modal>
+    <carrent-categoryone-modal ref="modalForm" @ok="modalFormOk"></carrent-categoryone-modal>
   </a-card>
 </template>
 
@@ -98,17 +98,17 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import CarrentComponentModal from './modules/CarrentComponentModal'
+  import CarrentCategoryoneModal from './modules/CarrentCategoryoneModal'
 
   export default {
-    name: 'CarrentComponentList',
+    name: 'CarrentCategoryoneList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      CarrentComponentModal
+      CarrentCategoryoneModal
     },
     data () {
       return {
-        description: '设备部件表管理页面',
+        description: '商品一级分类管理页面',
         // 表头
         columns: [
           {
@@ -122,7 +122,7 @@
             }
           },
           {
-            title:'部件名称',
+            title:'一级分类名称',
             align:"center",
             dataIndex: 'name'
           },
@@ -136,11 +136,11 @@
           }
         ],
         url: {
-          list: "/carrentComponent/carrentComponent/list",
-          delete: "/carrentComponent/carrentComponent/delete",
-          deleteBatch: "/carrentComponent/carrentComponent/deleteBatch",
-          exportXlsUrl: "/carrentComponent/carrentComponent/exportXls",
-          importExcelUrl: "carrentComponent/carrentComponent/importExcel",
+          list: "/carrentCategoryone/carrentCategoryone/list",
+          delete: "/carrentCategoryone/carrentCategoryone/delete",
+          deleteBatch: "/carrentCategoryone/carrentCategoryone/deleteBatch",
+          exportXlsUrl: "/carrentCategoryone/carrentCategoryone/exportXls",
+          importExcelUrl: "carrentCategoryone/carrentCategoryone/importExcel",
           
         },
         dictOptions:{},
@@ -160,7 +160,7 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'name',text:'部件名称',dictCode:''})
+        fieldList.push({type:'string',value:'name',text:'一级分类名称',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue/modules/CarrentComponentForm.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategoryone/vue/modules/CarrentCategoryoneForm.vue

@@ -4,8 +4,8 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="部件名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
-              <a-input v-model="model.name" placeholder="请输入部件名称"  ></a-input>
+            <a-form-model-item label="一级分类名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" placeholder="请输入一级分类名称"  ></a-input>
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -20,7 +20,7 @@
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
-    name: 'CarrentComponentForm',
+    name: 'CarrentCategoryoneForm',
     components: {
     },
     props: {
@@ -47,9 +47,9 @@
         validatorRules: {
         },
         url: {
-          add: "/carrentComponent/carrentComponent/add",
-          edit: "/carrentComponent/carrentComponent/edit",
-          queryById: "/carrentComponent/carrentComponent/queryById"
+          add: "/carrentCategoryone/carrentCategoryone/add",
+          edit: "/carrentCategoryone/carrentCategoryone/edit",
+          queryById: "/carrentCategoryone/carrentCategoryone/queryById"
         }
       }
     },

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue/modules/CarrentComponentModal.Style#Drawer.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategoryone/vue/modules/CarrentCategoryoneModal.Style#Drawer.vue

@@ -7,7 +7,7 @@
     @close="close"
     destroyOnClose
     :visible="visible">
-    <carrent-component-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></carrent-component-form>
+    <carrent-categoryone-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></carrent-categoryone-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>
@@ -17,12 +17,12 @@
 
 <script>
 
-  import CarrentComponentForm from './CarrentComponentForm'
+  import CarrentCategoryoneForm from './CarrentCategoryoneForm'
 
   export default {
-    name: 'CarrentComponentModal',
+    name: 'CarrentCategoryoneModal',
     components: {
-      CarrentComponentForm
+      CarrentCategoryoneForm
     },
     data () {
       return {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue/modules/CarrentComponentModal.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategoryone/vue/modules/CarrentCategoryoneModal.vue

@@ -8,17 +8,17 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <carrent-component-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></carrent-component-form>
+    <carrent-categoryone-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></carrent-categoryone-form>
   </j-modal>
 </template>
 
 <script>
 
-  import CarrentComponentForm from './CarrentComponentForm'
+  import CarrentCategoryoneForm from './CarrentCategoryoneForm'
   export default {
-    name: 'CarrentComponentModal',
+    name: 'CarrentCategoryoneModal',
     components: {
-      CarrentComponentForm
+      CarrentCategoryoneForm
     },
     data () {
       return {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue3/CarrentComponent.api.ts → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategoryone/vue3/CarrentCategoryone.api.ts

@@ -2,13 +2,13 @@ import {defHttp} from '/@/utils/http/axios';
 import {Modal} from 'ant-design-vue';
 
 enum Api {
-  list = '/carrentComponent/carrentComponent/list',
-  save='/carrentComponent/carrentComponent/add',
-  edit='/carrentComponent/carrentComponent/edit',
-  deleteOne = '/carrentComponent/carrentComponent/delete',
-  deleteBatch = '/carrentComponent/carrentComponent/deleteBatch',
-  importExcel = '/carrentComponent/carrentComponent/importExcel',
-  exportXls = '/carrentComponent/carrentComponent/exportXls',
+  list = '/carrentCategoryone/carrentCategoryone/list',
+  save='/carrentCategoryone/carrentCategoryone/add',
+  edit='/carrentCategoryone/carrentCategoryone/edit',
+  deleteOne = '/carrentCategoryone/carrentCategoryone/delete',
+  deleteBatch = '/carrentCategoryone/carrentCategoryone/deleteBatch',
+  importExcel = '/carrentCategoryone/carrentCategoryone/importExcel',
+  exportXls = '/carrentCategoryone/carrentCategoryone/exportXls',
 }
 /**
  * 导出api

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue3/CarrentComponent.data.ts → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategoryone/vue3/CarrentCategoryone.data.ts

@@ -5,7 +5,7 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
     {
-    title: '部件名称',
+    title: '一级分类名称',
     align:"center",
     dataIndex: 'name'
    },
@@ -16,7 +16,7 @@ export const searchFormSchema: FormSchema[] = [
 //表单数据
 export const formSchema: FormSchema[] = [
   {
-    label: '部件名称',
+    label: '一级分类名称',
     field: 'name',
     component: 'Input',
   },

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentComponent/vue3/CarrentComponentList.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategoryone/vue3/CarrentCategoryoneList.vue

@@ -35,25 +35,25 @@
       </template>
     </BasicTable>
     <!-- 表单区域 -->
-    <CarrentComponentModal @register="registerModal" @success="handleSuccess"></CarrentComponentModal>
+    <CarrentCategoryoneModal @register="registerModal" @success="handleSuccess"></CarrentCategoryoneModal>
   </div>
 </template>
 
-<script lang="ts" name="carrentComponent-carrentComponent" setup>
+<script lang="ts" name="carrentCategoryone-carrentCategoryone" 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 CarrentComponentModal from './components/CarrentComponentModal.vue'
-  import {columns, searchFormSchema} from './carrentComponent.data';
-  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './carrentComponent.api';
+  import CarrentCategoryoneModal from './components/CarrentCategoryoneModal.vue'
+  import {columns, searchFormSchema} from './carrentCategoryone.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './carrentCategoryone.api';
   const checkedKeys = ref<Array<string | number>>([]);
   //注册model
   const [registerModal, {openModal}] = useModal();
   //注册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/carrentComponent/vue3/components/CarrentComponentModal.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategoryone/vue3/components/CarrentCategoryoneModal.vue

@@ -8,8 +8,8 @@
     import {ref, computed, unref} from 'vue';
     import {BasicModal, useModalInner} from '/@/components/Modal';
     import {BasicForm, useForm} from '/@/components/Form/index';
-    import {formSchema} from '../carrentComponent.data';
-    import {saveOrUpdate} from '../carrentComponent.api';
+    import {formSchema} from '../carrentCategoryone.data';
+    import {saveOrUpdate} from '../carrentCategoryone.api';
     // Emits声明
     const emit = defineEmits(['register','success']);
     const isUpdate = ref(true);

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/controller/CarrentCategorytwoController.java

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

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

@@ -1,4 +1,4 @@
-package org.jeecg.modules.carrentMileage.entity;
+package org.jeecg.modules.carrentCategorytwo.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
@@ -18,17 +18,17 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @Description: 里程范围表
+ * @Description: 商品二级分类
  * @Author: jeecg-boot
- * @Date:   2024-11-12
+ * @Date:   2024-12-12
  * @Version: V1.0
  */
 @Data
-@TableName("carrent_mileage")
+@TableName("carrent_categorytwo")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="carrent_mileage对象", description="里程范围表")
-public class CarrentMileage implements Serializable {
+@ApiModel(value="carrent_categorytwo对象", description="商品二级分类")
+public class CarrentCategorytwo implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键*/
@@ -47,12 +47,13 @@ public class CarrentMileage implements Serializable {
 	/**更新日期*/
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
-	/**里程范围下限*/
-	@Excel(name = "里程范围下限", width = 15)
-    @ApiModelProperty(value = "里程范围下限")
-    private java.lang.String rangeLow;
-	/**里程范围上线*/
-	@Excel(name = "里程范围上线", width = 15)
-    @ApiModelProperty(value = "里程范围上线")
-    private java.lang.String rangeUp;
+	/**二级分类名称*/
+	@Excel(name = "二级分类名称", width = 15)
+    @ApiModelProperty(value = "二级分类名称")
+    private java.lang.String name;
+	/**关联一级分类id*/
+	@Excel(name = "关联一级分类id", width = 15, dictTable = "carrent_categoryone", dicText = "name", dicCode = "id")
+	@Dict(dictTable = "carrent_categoryone", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "关联一级分类id")
+    private java.lang.String categoryoneId;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/mapper/CarrentCategorytwoMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.carrentCategorytwo.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.carrentCategorytwo.entity.CarrentCategorytwo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 商品二级分类
+ * @Author: jeecg-boot
+ * @Date:   2024-12-12
+ * @Version: V1.0
+ */
+public interface CarrentCategorytwoMapper extends BaseMapper<CarrentCategorytwo> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/mapper/xml/CarrentCategorytwoMapper.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.carrentCategorytwo.mapper.CarrentCategorytwoMapper">
+
+</mapper>

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.carrentCategorytwo.service;
+
+import org.jeecg.modules.carrentCategorytwo.entity.CarrentCategorytwo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 商品二级分类
+ * @Author: jeecg-boot
+ * @Date:   2024-12-12
+ * @Version: V1.0
+ */
+public interface ICarrentCategorytwoService extends IService<CarrentCategorytwo> {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.carrentCategorytwo.service.impl;
+
+import org.jeecg.modules.carrentCategorytwo.entity.CarrentCategorytwo;
+import org.jeecg.modules.carrentCategorytwo.mapper.CarrentCategorytwoMapper;
+import org.jeecg.modules.carrentCategorytwo.service.ICarrentCategorytwoService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 商品二级分类
+ * @Author: jeecg-boot
+ * @Date:   2024-12-12
+ * @Version: V1.0
+ */
+@Service
+public class CarrentCategorytwoServiceImpl extends ServiceImpl<CarrentCategorytwoMapper, CarrentCategorytwo> implements ICarrentCategorytwoService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue/CarrentAreaList.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue/CarrentCategorytwoList.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>
@@ -89,7 +89,7 @@
       </a-table>
     </div>
 
-    <carrent-area-modal ref="modalForm" @ok="modalFormOk"></carrent-area-modal>
+    <carrent-categorytwo-modal ref="modalForm" @ok="modalFormOk"></carrent-categorytwo-modal>
   </a-card>
 </template>
 
@@ -98,17 +98,18 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import CarrentAreaModal from './modules/CarrentAreaModal'
+  import CarrentCategorytwoModal from './modules/CarrentCategorytwoModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
-    name: 'CarrentAreaList',
+    name: 'CarrentCategorytwoList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      CarrentAreaModal
+      CarrentCategorytwoModal
     },
     data () {
       return {
-        description: '区域表管理页面',
+        description: '商品二级分类管理页面',
         // 表头
         columns: [
           {
@@ -122,9 +123,14 @@
             }
           },
           {
-            title:'所属区域',
+            title:'二级分类名称',
             align:"center",
-            dataIndex: 'area'
+            dataIndex: 'name'
+          },
+          {
+            title:'关联一级分类id',
+            align:"center",
+            dataIndex: 'categoryoneId_dictText'
           },
           {
             title: '操作',
@@ -136,11 +142,11 @@
           }
         ],
         url: {
-          list: "/carrentArea/carrentArea/list",
-          delete: "/carrentArea/carrentArea/delete",
-          deleteBatch: "/carrentArea/carrentArea/deleteBatch",
-          exportXlsUrl: "/carrentArea/carrentArea/exportXls",
-          importExcelUrl: "carrentArea/carrentArea/importExcel",
+          list: "/carrentCategorytwo/carrentCategorytwo/list",
+          delete: "/carrentCategorytwo/carrentCategorytwo/delete",
+          deleteBatch: "/carrentCategorytwo/carrentCategorytwo/deleteBatch",
+          exportXlsUrl: "/carrentCategorytwo/carrentCategorytwo/exportXls",
+          importExcelUrl: "carrentCategorytwo/carrentCategorytwo/importExcel",
           
         },
         dictOptions:{},
@@ -160,7 +166,8 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'area',text:'所属区域',dictCode:''})
+        fieldList.push({type:'string',value:'name',text:'二级分类名称',dictCode:''})
+        fieldList.push({type:'string',value:'categoryoneId',text:'关联一级分类id',dictCode:"carrent_categoryone,name,id"})
         this.superFieldList = fieldList
       }
     }

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

@@ -4,13 +4,13 @@
       <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="rangeLow">
-              <a-input v-model="model.rangeLow" placeholder="请输入里程范围下限"  ></a-input>
+            <a-form-model-item label="二级分类名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" placeholder="请输入二级分类名称"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="里程范围上线" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="rangeUp">
-              <a-input v-model="model.rangeUp" placeholder="请输入里程范围上线"  ></a-input>
+            <a-form-model-item label="关联一级分类id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="categoryoneId">
+              <j-dict-select-tag type="list" v-model="model.categoryoneId" dictCode="carrent_categoryone,name,id" placeholder="请选择关联一级分类id" />
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -25,7 +25,7 @@
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
-    name: 'CarrentMileageForm',
+    name: 'CarrentCategorytwoForm',
     components: {
     },
     props: {
@@ -52,9 +52,9 @@
         validatorRules: {
         },
         url: {
-          add: "/carrentMileage/carrentMileage/add",
-          edit: "/carrentMileage/carrentMileage/edit",
-          queryById: "/carrentMileage/carrentMileage/queryById"
+          add: "/carrentCategorytwo/carrentCategorytwo/add",
+          edit: "/carrentCategorytwo/carrentCategorytwo/edit",
+          queryById: "/carrentCategorytwo/carrentCategorytwo/queryById"
         }
       }
     },

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

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <carrent-categorytwo-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></carrent-categorytwo-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 CarrentCategorytwoForm from './CarrentCategorytwoForm'
+
+  export default {
+    name: 'CarrentCategorytwoModal',
+    components: {
+      CarrentCategorytwoForm
+    },
+    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/carrentCategorytwo/vue/modules/CarrentCategorytwoModal.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-categorytwo-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></carrent-categorytwo-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CarrentCategorytwoForm from './CarrentCategorytwoForm'
+  export default {
+    name: 'CarrentCategorytwoModal',
+    components: {
+      CarrentCategorytwoForm
+    },
+    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/carrentCategorytwo/vue3/CarrentCategorytwo.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/carrentCategorytwo/carrentCategorytwo/list',
+  save='/carrentCategorytwo/carrentCategorytwo/add',
+  edit='/carrentCategorytwo/carrentCategorytwo/edit',
+  deleteOne = '/carrentCategorytwo/carrentCategorytwo/delete',
+  deleteBatch = '/carrentCategorytwo/carrentCategorytwo/deleteBatch',
+  importExcel = '/carrentCategorytwo/carrentCategorytwo/importExcel',
+  exportXls = '/carrentCategorytwo/carrentCategorytwo/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 → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue3/CarrentCategorytwo.data.ts

@@ -5,14 +5,14 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
     {
-    title: '里程范围下限',
+    title: '二级分类名称',
     align:"center",
-    dataIndex: 'rangeLow'
+    dataIndex: 'name'
    },
    {
-    title: '里程范围上线',
+    title: '关联一级分类id',
     align:"center",
-    dataIndex: 'rangeUp'
+    dataIndex: 'categoryoneId_dictText'
    },
 ];
 //查询数据
@@ -21,13 +21,16 @@ export const searchFormSchema: FormSchema[] = [
 //表单数据
 export const formSchema: FormSchema[] = [
   {
-    label: '里程范围下限',
-    field: 'rangeLow',
+    label: '二级分类名称',
+    field: 'name',
     component: 'Input',
   },
   {
-    label: '里程范围上线',
-    field: 'rangeUp',
-    component: 'Input',
+    label: '关联一级分类id',
+    field: 'categoryoneId',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"carrent_categoryone,name,id"
+     },
   },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategorytwo/vue3/CarrentCategorytwoList.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>
+    <!-- 表单区域 -->
+    <CarrentCategorytwoModal @register="registerModal" @success="handleSuccess"></CarrentCategorytwoModal>
+  </div>
+</template>
+
+<script lang="ts" name="carrentCategorytwo-carrentCategorytwo" 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 CarrentCategorytwoModal from './components/CarrentCategorytwoModal.vue'
+  import {columns, searchFormSchema} from './carrentCategorytwo.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './carrentCategorytwo.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/carrentCategorytwo/vue3/components/CarrentCategorytwoModal.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 '../carrentCategorytwo.data';
+    import {saveOrUpdate} from '../carrentCategorytwo.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/carrentComponent/mapper/CarrentComponentMapper.java

@@ -1,17 +0,0 @@
-package org.jeecg.modules.carrentComponent.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.carrentComponent.entity.CarrentComponent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 设备部件表
- * @Author: jeecg-boot
- * @Date:   2024-11-12
- * @Version: V1.0
- */
-public interface CarrentComponentMapper extends BaseMapper<CarrentComponent> {
-
-}

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

@@ -1,14 +0,0 @@
-package org.jeecg.modules.carrentComponent.service;
-
-import org.jeecg.modules.carrentComponent.entity.CarrentComponent;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 设备部件表
- * @Author: jeecg-boot
- * @Date:   2024-11-12
- * @Version: V1.0
- */
-public interface ICarrentComponentService extends IService<CarrentComponent> {
-
-}

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

@@ -1,19 +0,0 @@
-package org.jeecg.modules.carrentComponent.service.impl;
-
-import org.jeecg.modules.carrentComponent.entity.CarrentComponent;
-import org.jeecg.modules.carrentComponent.mapper.CarrentComponentMapper;
-import org.jeecg.modules.carrentComponent.service.ICarrentComponentService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 设备部件表
- * @Author: jeecg-boot
- * @Date:   2024-11-12
- * @Version: V1.0
- */
-@Service
-public class CarrentComponentServiceImpl extends ServiceImpl<CarrentComponentMapper, CarrentComponent> implements ICarrentComponentService {
-
-}

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

@@ -1,4 +1,4 @@
-package org.jeecg.modules.carrentMileage.controller;
+package org.jeecg.modules.carrentConfig.controller;
 
 import java.util.Arrays;
 import java.util.List;
@@ -12,8 +12,8 @@ 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 org.jeecg.modules.carrentConfig.entity.CarrentConfig;
+import org.jeecg.modules.carrentConfig.service.ICarrentConfigService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -37,66 +37,66 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 
  /**
- * @Description: 里程范围表
+ * @Description: 系统配置表
  * @Author: jeecg-boot
- * @Date:   2024-11-12
+ * @Date:   2024-12-12
  * @Version: V1.0
  */
-@Api(tags="里程范围表")
+@Api(tags="系统配置表")
 @RestController
-@RequestMapping("/carrentMileage/carrentMileage")
+@RequestMapping("/carrentConfig/carrentConfig")
 @Slf4j
-public class CarrentMileageController extends JeecgController<CarrentMileage, ICarrentMileageService> {
+public class CarrentConfigController extends JeecgController<CarrentConfig, ICarrentConfigService> {
 	@Autowired
-	private ICarrentMileageService carrentMileageService;
+	private ICarrentConfigService carrentConfigService;
 	
 	/**
 	 * 分页列表查询
 	 *
-	 * @param carrentMileage
+	 * @param carrentConfig
 	 * @param pageNo
 	 * @param pageSize
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "里程范围表-分页列表查询")
-	@ApiOperation(value="里程范围表-分页列表查询", notes="里程范围表-分页列表查询")
+	//@AutoLog(value = "系统配置表-分页列表查询")
+	@ApiOperation(value="系统配置表-分页列表查询", notes="系统配置表-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<CarrentMileage>> queryPageList(CarrentMileage carrentMileage,
+	public Result<IPage<CarrentConfig>> queryPageList(CarrentConfig carrentConfig,
 								   @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);
+		QueryWrapper<CarrentConfig> queryWrapper = QueryGenerator.initQueryWrapper(carrentConfig, req.getParameterMap());
+		Page<CarrentConfig> page = new Page<CarrentConfig>(pageNo, pageSize);
+		IPage<CarrentConfig> pageList = carrentConfigService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
 	
 	/**
 	 *   添加
 	 *
-	 * @param carrentMileage
+	 * @param carrentConfig
 	 * @return
 	 */
-	@AutoLog(value = "里程范围表-添加")
-	@ApiOperation(value="里程范围表-添加", notes="里程范围表-添加")
+	@AutoLog(value = "系统配置表-添加")
+	@ApiOperation(value="系统配置表-添加", notes="系统配置表-添加")
 	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody CarrentMileage carrentMileage) {
-		carrentMileageService.save(carrentMileage);
+	public Result<String> add(@RequestBody CarrentConfig carrentConfig) {
+		carrentConfigService.save(carrentConfig);
 		return Result.OK("添加成功！");
 	}
 	
 	/**
 	 *  编辑
 	 *
-	 * @param carrentMileage
+	 * @param carrentConfig
 	 * @return
 	 */
-	@AutoLog(value = "里程范围表-编辑")
-	@ApiOperation(value="里程范围表-编辑", notes="里程范围表-编辑")
+	@AutoLog(value = "系统配置表-编辑")
+	@ApiOperation(value="系统配置表-编辑", notes="系统配置表-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody CarrentMileage carrentMileage) {
-		carrentMileageService.updateById(carrentMileage);
+	public Result<String> edit(@RequestBody CarrentConfig carrentConfig) {
+		carrentConfigService.updateById(carrentConfig);
 		return Result.OK("编辑成功!");
 	}
 	
@@ -106,11 +106,11 @@ public class CarrentMileageController extends JeecgController<CarrentMileage, IC
 	 * @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) {
-		carrentMileageService.removeById(id);
+		carrentConfigService.removeById(id);
 		return Result.OK("删除成功!");
 	}
 	
@@ -120,11 +120,11 @@ public class CarrentMileageController extends JeecgController<CarrentMileage, IC
 	 * @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.carrentMileageService.removeByIds(Arrays.asList(ids.split(",")));
+		this.carrentConfigService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
 	
@@ -134,26 +134,26 @@ public class CarrentMileageController extends JeecgController<CarrentMileage, IC
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "里程范围表-通过id查询")
-	@ApiOperation(value="里程范围表-通过id查询", notes="里程范围表-通过id查询")
+	//@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) {
+	public Result<CarrentConfig> queryById(@RequestParam(name="id",required=true) String id) {
+		CarrentConfig carrentConfig = carrentConfigService.getById(id);
+		if(carrentConfig==null) {
 			return Result.error("未找到对应数据");
 		}
-		return Result.OK(carrentMileage);
+		return Result.OK(carrentConfig);
 	}
 
     /**
     * 导出excel
     *
     * @param request
-    * @param carrentMileage
+    * @param carrentConfig
     */
     @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, CarrentMileage carrentMileage) {
-        return super.exportXls(request, carrentMileage, CarrentMileage.class, "里程范围表");
+    public ModelAndView exportXls(HttpServletRequest request, CarrentConfig carrentConfig) {
+        return super.exportXls(request, carrentConfig, CarrentConfig.class, "系统配置表");
     }
 
     /**
@@ -165,7 +165,7 @@ public class CarrentMileageController extends JeecgController<CarrentMileage, IC
     */
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, CarrentMileage.class);
+        return super.importExcel(request, response, CarrentConfig.class);
     }
 
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/entity/CarrentArea.java → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/entity/CarrentConfig.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.carrentArea.entity;
+package org.jeecg.modules.carrentConfig.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
@@ -18,17 +18,17 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @Description: 区域表
+ * @Description: 系统配置表
  * @Author: jeecg-boot
- * @Date:   2024-11-12
+ * @Date:   2024-12-12
  * @Version: V1.0
  */
 @Data
-@TableName("carrent_area")
+@TableName("carrent_config")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="carrent_area对象", description="区域表")
-public class CarrentArea implements Serializable {
+@ApiModel(value="carrent_config对象", description="系统配置表")
+public class CarrentConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键*/
@@ -47,8 +47,16 @@ public class CarrentArea implements Serializable {
 	/**更新日期*/
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
-	/**所属区域*/
-	@Excel(name = "所属区域", width = 15)
-    @ApiModelProperty(value = "所属区域")
-    private java.lang.String area;
+	/**参数编码*/
+	@Excel(name = "参数编码", width = 15)
+    @ApiModelProperty(value = "参数编码")
+    private java.lang.String paramCode;
+	/**参数值*/
+	@Excel(name = "参数值", width = 15)
+    @ApiModelProperty(value = "参数值")
+    private java.lang.String paramValue;
+	/**参数描述*/
+	@Excel(name = "参数描述", width = 15)
+    @ApiModelProperty(value = "参数描述")
+    private java.lang.String paramDescribe;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/mapper/CarrentConfigMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.carrentConfig.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.carrentConfig.entity.CarrentConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 系统配置表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-12
+ * @Version: V1.0
+ */
+public interface CarrentConfigMapper extends BaseMapper<CarrentConfig> {
+
+}

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

@@ -1,5 +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 namespace="org.jeecg.modules.carrentConfig.mapper.CarrentConfigMapper">
 
 </mapper>

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.carrentConfig.service;
+
+import org.jeecg.modules.carrentConfig.entity.CarrentConfig;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 系统配置表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-12
+ * @Version: V1.0
+ */
+public interface ICarrentConfigService extends IService<CarrentConfig> {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.carrentConfig.service.impl;
+
+import org.jeecg.modules.carrentConfig.entity.CarrentConfig;
+import org.jeecg.modules.carrentConfig.mapper.CarrentConfigMapper;
+import org.jeecg.modules.carrentConfig.service.ICarrentConfigService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 系统配置表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-12
+ * @Version: V1.0
+ */
+@Service
+public class CarrentConfigServiceImpl extends ServiceImpl<CarrentConfigMapper, CarrentConfig> implements ICarrentConfigService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentMileage/vue/CarrentMileageList.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue/CarrentConfigList.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>
@@ -89,7 +89,7 @@
       </a-table>
     </div>
 
-    <carrent-mileage-modal ref="modalForm" @ok="modalFormOk"></carrent-mileage-modal>
+    <carrent-config-modal ref="modalForm" @ok="modalFormOk"></carrent-config-modal>
   </a-card>
 </template>
 
@@ -98,17 +98,17 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import CarrentMileageModal from './modules/CarrentMileageModal'
+  import CarrentConfigModal from './modules/CarrentConfigModal'
 
   export default {
-    name: 'CarrentMileageList',
+    name: 'CarrentConfigList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      CarrentMileageModal
+      CarrentConfigModal
     },
     data () {
       return {
-        description: '里程范围表管理页面',
+        description: '系统配置表管理页面',
         // 表头
         columns: [
           {
@@ -122,14 +122,19 @@
             }
           },
           {
-            title:'里程范围下限',
+            title:'参数编码',
             align:"center",
-            dataIndex: 'rangeLow'
+            dataIndex: 'paramCode'
           },
           {
-            title:'里程范围上线',
+            title:'参数值',
             align:"center",
-            dataIndex: 'rangeUp'
+            dataIndex: 'paramValue'
+          },
+          {
+            title:'参数描述',
+            align:"center",
+            dataIndex: 'paramDescribe'
           },
           {
             title: '操作',
@@ -141,11 +146,11 @@
           }
         ],
         url: {
-          list: "/carrentMileage/carrentMileage/list",
-          delete: "/carrentMileage/carrentMileage/delete",
-          deleteBatch: "/carrentMileage/carrentMileage/deleteBatch",
-          exportXlsUrl: "/carrentMileage/carrentMileage/exportXls",
-          importExcelUrl: "carrentMileage/carrentMileage/importExcel",
+          list: "/carrentConfig/carrentConfig/list",
+          delete: "/carrentConfig/carrentConfig/delete",
+          deleteBatch: "/carrentConfig/carrentConfig/deleteBatch",
+          exportXlsUrl: "/carrentConfig/carrentConfig/exportXls",
+          importExcelUrl: "carrentConfig/carrentConfig/importExcel",
           
         },
         dictOptions:{},
@@ -165,8 +170,9 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'rangeLow',text:'里程范围下限',dictCode:''})
-        fieldList.push({type:'string',value:'rangeUp',text:'里程范围上线',dictCode:''})
+        fieldList.push({type:'string',value:'paramCode',text:'参数编码',dictCode:''})
+        fieldList.push({type:'Text',value:'paramValue',text:'参数值',dictCode:''})
+        fieldList.push({type:'string',value:'paramDescribe',text:'参数描述',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue/modules/CarrentAreaForm.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue/modules/CarrentConfigForm.vue

@@ -4,8 +4,18 @@
       <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="area">
-              <a-input v-model="model.area" placeholder="请输入所属区域"  ></a-input>
+            <a-form-model-item label="参数编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paramCode">
+              <a-input v-model="model.paramCode" placeholder="请输入参数编码"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="参数值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paramValue">
+              <a-input v-model="model.paramValue" placeholder="请输入参数值"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="参数描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paramDescribe">
+              <a-input v-model="model.paramDescribe" placeholder="请输入参数描述"  ></a-input>
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -20,7 +30,7 @@
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
-    name: 'CarrentAreaForm',
+    name: 'CarrentConfigForm',
     components: {
     },
     props: {
@@ -47,9 +57,9 @@
         validatorRules: {
         },
         url: {
-          add: "/carrentArea/carrentArea/add",
-          edit: "/carrentArea/carrentArea/edit",
-          queryById: "/carrentArea/carrentArea/queryById"
+          add: "/carrentConfig/carrentConfig/add",
+          edit: "/carrentConfig/carrentConfig/edit",
+          queryById: "/carrentConfig/carrentConfig/queryById"
         }
       }
     },

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

@@ -7,7 +7,7 @@
     @close="close"
     destroyOnClose
     :visible="visible">
-    <carrent-mileage-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></carrent-mileage-form>
+    <carrent-config-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></carrent-config-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>
@@ -17,12 +17,12 @@
 
 <script>
 
-  import CarrentMileageForm from './CarrentMileageForm'
+  import CarrentConfigForm from './CarrentConfigForm'
 
   export default {
-    name: 'CarrentMileageModal',
+    name: 'CarrentConfigModal',
     components: {
-      CarrentMileageForm
+      CarrentConfigForm
     },
     data () {
       return {

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

@@ -8,17 +8,17 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <carrent-mileage-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></carrent-mileage-form>
+    <carrent-config-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></carrent-config-form>
   </j-modal>
 </template>
 
 <script>
 
-  import CarrentMileageForm from './CarrentMileageForm'
+  import CarrentConfigForm from './CarrentConfigForm'
   export default {
-    name: 'CarrentMileageModal',
+    name: 'CarrentConfigModal',
     components: {
-      CarrentMileageForm
+      CarrentConfigForm
     },
     data () {
       return {

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

@@ -2,13 +2,13 @@ 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',
+  list = '/carrentConfig/carrentConfig/list',
+  save='/carrentConfig/carrentConfig/add',
+  edit='/carrentConfig/carrentConfig/edit',
+  deleteOne = '/carrentConfig/carrentConfig/delete',
+  deleteBatch = '/carrentConfig/carrentConfig/deleteBatch',
+  importExcel = '/carrentConfig/carrentConfig/importExcel',
+  exportXls = '/carrentConfig/carrentConfig/exportXls',
 }
 /**
  * 导出api

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/vue3/CarrentArea.data.ts → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue3/CarrentConfig.data.ts

@@ -5,9 +5,19 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
     {
-    title: '所属区域',
+    title: '参数编码',
     align:"center",
-    dataIndex: 'area'
+    dataIndex: 'paramCode'
+   },
+   {
+    title: '参数值',
+    align:"center",
+    dataIndex: 'paramValue'
+   },
+   {
+    title: '参数描述',
+    align:"center",
+    dataIndex: 'paramDescribe'
    },
 ];
 //查询数据
@@ -16,8 +26,18 @@ export const searchFormSchema: FormSchema[] = [
 //表单数据
 export const formSchema: FormSchema[] = [
   {
-    label: '所属区域',
-    field: 'area',
+    label: '参数编码',
+    field: 'paramCode',
+    component: 'Input',
+  },
+  {
+    label: '参数值',
+    field: 'paramValue',
+    component: 'Input',
+  },
+  {
+    label: '参数描述',
+    field: 'paramDescribe',
     component: 'Input',
   },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue3/CarrentCategoryList.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue3/CarrentConfigList.vue

@@ -35,25 +35,25 @@
       </template>
     </BasicTable>
     <!-- 表单区域 -->
-    <CarrentCategoryModal @register="registerModal" @success="handleSuccess"></CarrentCategoryModal>
+    <CarrentConfigModal @register="registerModal" @success="handleSuccess"></CarrentConfigModal>
   </div>
 </template>
 
-<script lang="ts" name="carrentCategory-carrentCategory" setup>
+<script lang="ts" name="carrentConfig-carrentConfig" 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 CarrentCategoryModal from './components/CarrentCategoryModal.vue'
-  import {columns, searchFormSchema} from './carrentCategory.data';
-  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './carrentCategory.api';
+  import CarrentConfigModal from './components/CarrentConfigModal.vue'
+  import {columns, searchFormSchema} from './carrentConfig.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './carrentConfig.api';
   const checkedKeys = ref<Array<string | number>>([]);
   //注册model
   const [registerModal, {openModal}] = useModal();
   //注册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/carrentMileage/vue3/components/CarrentMileageModal.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue3/components/CarrentConfigModal.vue

@@ -8,8 +8,8 @@
     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';
+    import {formSchema} from '../carrentConfig.data';
+    import {saveOrUpdate} from '../carrentConfig.api';
     // Emits声明
     const emit = defineEmits(['register','success']);
     const isUpdate = ref(true);

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/controller/CarrentCarController.java → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/controller/CarrentGoodsController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.carrentCar.controller;
+package org.jeecg.modules.carrentGoods.controller;
 
 import java.util.Arrays;
 import java.util.List;
@@ -12,8 +12,8 @@ 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.carrentCar.entity.CarrentCar;
-import org.jeecg.modules.carrentCar.service.ICarrentCarService;
+import org.jeecg.modules.carrentGoods.entity.CarrentGoods;
+import org.jeecg.modules.carrentGoods.service.ICarrentGoodsService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -37,66 +37,66 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 
  /**
- * @Description: 车辆信息表
+ * @Description: 商品信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-03
+ * @Date:   2024-12-12
  * @Version: V1.0
  */
-@Api(tags="车辆信息表")
+@Api(tags="商品信息表")
 @RestController
-@RequestMapping("/carrentCar/carrentCar")
+@RequestMapping("/carrentGoods/carrentGoods")
 @Slf4j
-public class CarrentCarController extends JeecgController<CarrentCar, ICarrentCarService> {
+public class CarrentGoodsController extends JeecgController<CarrentGoods, ICarrentGoodsService> {
 	@Autowired
-	private ICarrentCarService carrentCarService;
+	private ICarrentGoodsService carrentGoodsService;
 	
 	/**
 	 * 分页列表查询
 	 *
-	 * @param carrentCar
+	 * @param carrentGoods
 	 * @param pageNo
 	 * @param pageSize
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "车辆信息表-分页列表查询")
-	@ApiOperation(value="车辆信息表-分页列表查询", notes="车辆信息表-分页列表查询")
+	//@AutoLog(value = "商品信息表-分页列表查询")
+	@ApiOperation(value="商品信息表-分页列表查询", notes="商品信息表-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<CarrentCar>> queryPageList(CarrentCar carrentCar,
+	public Result<IPage<CarrentGoods>> queryPageList(CarrentGoods carrentGoods,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<CarrentCar> queryWrapper = QueryGenerator.initQueryWrapper(carrentCar, req.getParameterMap());
-		Page<CarrentCar> page = new Page<CarrentCar>(pageNo, pageSize);
-		IPage<CarrentCar> pageList = carrentCarService.page(page, queryWrapper);
+		QueryWrapper<CarrentGoods> queryWrapper = QueryGenerator.initQueryWrapper(carrentGoods, req.getParameterMap());
+		Page<CarrentGoods> page = new Page<CarrentGoods>(pageNo, pageSize);
+		IPage<CarrentGoods> pageList = carrentGoodsService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
 	
 	/**
 	 *   添加
 	 *
-	 * @param carrentCar
+	 * @param carrentGoods
 	 * @return
 	 */
-	@AutoLog(value = "车辆信息表-添加")
-	@ApiOperation(value="车辆信息表-添加", notes="车辆信息表-添加")
+	@AutoLog(value = "商品信息表-添加")
+	@ApiOperation(value="商品信息表-添加", notes="商品信息表-添加")
 	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody CarrentCar carrentCar) {
-		carrentCarService.save(carrentCar);
+	public Result<String> add(@RequestBody CarrentGoods carrentGoods) {
+		carrentGoodsService.save(carrentGoods);
 		return Result.OK("添加成功！");
 	}
 	
 	/**
 	 *  编辑
 	 *
-	 * @param carrentCar
+	 * @param carrentGoods
 	 * @return
 	 */
-	@AutoLog(value = "车辆信息表-编辑")
-	@ApiOperation(value="车辆信息表-编辑", notes="车辆信息表-编辑")
+	@AutoLog(value = "商品信息表-编辑")
+	@ApiOperation(value="商品信息表-编辑", notes="商品信息表-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody CarrentCar carrentCar) {
-		carrentCarService.updateById(carrentCar);
+	public Result<String> edit(@RequestBody CarrentGoods carrentGoods) {
+		carrentGoodsService.updateById(carrentGoods);
 		return Result.OK("编辑成功!");
 	}
 	
@@ -106,11 +106,11 @@ public class CarrentCarController extends JeecgController<CarrentCar, ICarrentCa
 	 * @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) {
-		carrentCarService.removeById(id);
+		carrentGoodsService.removeById(id);
 		return Result.OK("删除成功!");
 	}
 	
@@ -120,11 +120,11 @@ public class CarrentCarController extends JeecgController<CarrentCar, ICarrentCa
 	 * @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.carrentCarService.removeByIds(Arrays.asList(ids.split(",")));
+		this.carrentGoodsService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
 	
@@ -134,26 +134,26 @@ public class CarrentCarController extends JeecgController<CarrentCar, ICarrentCa
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "车辆信息表-通过id查询")
-	@ApiOperation(value="车辆信息表-通过id查询", notes="车辆信息表-通过id查询")
+	//@AutoLog(value = "商品信息表-通过id查询")
+	@ApiOperation(value="商品信息表-通过id查询", notes="商品信息表-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<CarrentCar> queryById(@RequestParam(name="id",required=true) String id) {
-		CarrentCar carrentCar = carrentCarService.getById(id);
-		if(carrentCar==null) {
+	public Result<CarrentGoods> queryById(@RequestParam(name="id",required=true) String id) {
+		CarrentGoods carrentGoods = carrentGoodsService.getById(id);
+		if(carrentGoods==null) {
 			return Result.error("未找到对应数据");
 		}
-		return Result.OK(carrentCar);
+		return Result.OK(carrentGoods);
 	}
 
     /**
     * 导出excel
     *
     * @param request
-    * @param carrentCar
+    * @param carrentGoods
     */
     @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, CarrentCar carrentCar) {
-        return super.exportXls(request, carrentCar, CarrentCar.class, "车辆信息表");
+    public ModelAndView exportXls(HttpServletRequest request, CarrentGoods carrentGoods) {
+        return super.exportXls(request, carrentGoods, CarrentGoods.class, "商品信息表");
     }
 
     /**
@@ -165,7 +165,7 @@ public class CarrentCarController extends JeecgController<CarrentCar, ICarrentCa
     */
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, CarrentCar.class);
+        return super.importExcel(request, response, CarrentGoods.class);
     }
 
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/entity/CarrentCar.java → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/entity/CarrentGoods.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.carrentCar.entity;
+package org.jeecg.modules.carrentGoods.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
@@ -18,17 +18,17 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @Description: 车辆信息表
+ * @Description: 商品信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-03
+ * @Date:   2024-12-12
  * @Version: V1.0
  */
 @Data
-@TableName("carrent_car")
+@TableName("carrent_goods")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="carrent_car对象", description="车辆信息表")
-public class CarrentCar implements Serializable {
+@ApiModel(value="carrent_goods对象", description="商品信息表")
+public class CarrentGoods implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键*/
@@ -47,13 +47,17 @@ public class CarrentCar implements Serializable {
 	/**更新日期*/
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
-	/**车辆名称*/
-	@Excel(name = "车辆名称", width = 15)
-    @ApiModelProperty(value = "车辆名称")
-    private java.lang.String name;
-	/**车辆价格*/
-	@Excel(name = "车辆价格", width = 15)
-    @ApiModelProperty(value = "车辆价格")
+	/**商品名称*/
+	@Excel(name = "商品名称", width = 15)
+    @ApiModelProperty(value = "商品名称")
+    private java.lang.String goodsName;
+	/**商品图片*/
+	@Excel(name = "商品图片", width = 15)
+    @ApiModelProperty(value = "商品图片")
+    private java.lang.String image;
+	/**商品价格*/
+	@Excel(name = "商品价格", width = 15)
+    @ApiModelProperty(value = "商品价格")
     private java.math.BigDecimal price;
 	/**浏览量*/
 	@Excel(name = "浏览量", width = 15)
@@ -68,7 +72,7 @@ public class CarrentCar implements Serializable {
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "时间")
-    private java.util.Date carTime;
+    private java.util.Date goodsTime;
 	/**公里数*/
 	@Excel(name = "公里数", width = 15)
     @ApiModelProperty(value = "公里数")
@@ -77,17 +81,17 @@ public class CarrentCar implements Serializable {
 	@Excel(name = "型号", width = 15)
     @ApiModelProperty(value = "型号")
     private java.lang.String model;
-	/**车辆库存*/
-	@Excel(name = "车辆库存", width = 15)
-    @ApiModelProperty(value = "车辆库存")
-    private java.lang.Integer inventory;
-	/**车辆详情*/
-	@Excel(name = "车辆详情", width = 15)
-    @ApiModelProperty(value = "车辆详情")
+	/**详情*/
+	@Excel(name = "详情", width = 15)
+    @ApiModelProperty(value = "详情")
     private java.lang.String detail;
-	/**车辆图片(前)*/
-	@Excel(name = "车辆图片(前)", width = 15)
-    @ApiModelProperty(value = "车辆图片(前)")
+	/**库存*/
+	@Excel(name = "库存", width = 15)
+    @ApiModelProperty(value = "库存")
+    private java.lang.Integer inventory;
+	/**车辆照片(前)*/
+	@Excel(name = "车辆照片(前)", width = 15)
+    @ApiModelProperty(value = "车辆照片(前)")
     private java.lang.String imageFront;
 	/**车辆照片(后)*/
 	@Excel(name = "车辆照片(后)", width = 15)
@@ -105,14 +109,31 @@ public class CarrentCar implements Serializable {
 	@Excel(name = "车辆照片(驾驶室)", width = 15)
     @ApiModelProperty(value = "车辆照片(驾驶室)")
     private java.lang.String imageCab;
-	/**关联车辆类型id*/
-	@Excel(name = "关联车辆类型id", width = 15, dictTable = "carrent_type", dicText = "name", dicCode = "id")
+	/**联系人*/
+	@Excel(name = "联系人", width = 15)
+    @ApiModelProperty(value = "联系人")
+    private java.lang.String userName;
+	/**联系人电话*/
+	@Excel(name = "联系人电话", width = 15)
+    @ApiModelProperty(value = "联系人电话")
+    private java.lang.String phone;
+	/**所在区域*/
+	@Excel(name = "所在区域", width = 15)
+    @ApiModelProperty(value = "所在区域")
+    private java.lang.String area;
+	/**关联商品类型id*/
+	@Excel(name = "关联商品类型id", width = 15, dictTable = "carrent_type", dicText = "name", dicCode = "id")
 	@Dict(dictTable = "carrent_type", dicText = "name", dicCode = "id")
-    @ApiModelProperty(value = "关联车辆类型id")
-    private java.lang.String typeId;
-	/**关联车辆分类id*/
-	@Excel(name = "关联车辆分类id", width = 15, dictTable = "carrent_category", dicText = "name", dicCode = "id")
-	@Dict(dictTable = "carrent_category", dicText = "name", dicCode = "id")
-    @ApiModelProperty(value = "关联车辆分类id")
-    private java.lang.String categoryId;
+    @ApiModelProperty(value = "关联商品类型id")
+    private java.lang.String cartypeId;
+	/**关联二级分类id*/
+	@Excel(name = "关联二级分类id", width = 15, dictTable = "carrent_categorytwo", dicText = "name", dicCode = "id")
+	@Dict(dictTable = "carrent_categorytwo", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "关联二级分类id")
+    private java.lang.String categorytwoId;
+	/**关联用户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")
+    @ApiModelProperty(value = "关联用户id")
+    private java.lang.String userId;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/mapper/CarrentGoodsMapper.java

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/mapper/xml/CarrentCategoryMapper.xml → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/mapper/xml/CarrentGoodsMapper.xml

@@ -1,5 +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.carrentCategory.mapper.CarrentCategoryMapper">
+<mapper namespace="org.jeecg.modules.carrentGoods.mapper.CarrentGoodsMapper">
 
 </mapper>

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.carrentGoods.service;
+
+import org.jeecg.modules.carrentGoods.entity.CarrentGoods;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 商品信息表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-12
+ * @Version: V1.0
+ */
+public interface ICarrentGoodsService extends IService<CarrentGoods> {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.carrentGoods.service.impl;
+
+import org.jeecg.modules.carrentGoods.entity.CarrentGoods;
+import org.jeecg.modules.carrentGoods.mapper.CarrentGoodsMapper;
+import org.jeecg.modules.carrentGoods.service.ICarrentGoodsService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 商品信息表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-12
+ * @Version: V1.0
+ */
+@Service
+public class CarrentGoodsServiceImpl extends ServiceImpl<CarrentGoodsMapper, CarrentGoods> implements ICarrentGoodsService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue/CarrentCarList.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue/CarrentGoodsList.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>
@@ -89,7 +89,7 @@
       </a-table>
     </div>
 
-    <carrent-car-modal ref="modalForm" @ok="modalFormOk"></carrent-car-modal>
+    <carrent-goods-modal ref="modalForm" @ok="modalFormOk"></carrent-goods-modal>
   </a-card>
 </template>
 
@@ -98,18 +98,18 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import CarrentCarModal from './modules/CarrentCarModal'
+  import CarrentGoodsModal from './modules/CarrentGoodsModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
-    name: 'CarrentCarList',
+    name: 'CarrentGoodsList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      CarrentCarModal
+      CarrentGoodsModal
     },
     data () {
       return {
-        description: '车辆信息表管理页面',
+        description: '商品信息表管理页面',
         // 表头
         columns: [
           {
@@ -123,12 +123,17 @@
             }
           },
           {
-            title:'车辆名称',
+            title:'商品名称',
             align:"center",
-            dataIndex: 'name'
+            dataIndex: 'goodsName'
           },
           {
-            title:'车辆价格',
+            title:'商品图片',
+            align:"center",
+            dataIndex: 'image'
+          },
+          {
+            title:'商品价格',
             align:"center",
             dataIndex: 'price'
           },
@@ -145,7 +150,7 @@
           {
             title:'时间',
             align:"center",
-            dataIndex: 'carTime',
+            dataIndex: 'goodsTime',
             customRender:function (text) {
               return !text?"":(text.length>10?text.substr(0,10):text)
             }
@@ -161,54 +166,69 @@
             dataIndex: 'model'
           },
           {
-            title:'车辆库存',
+            title:'详情',
             align:"center",
-            dataIndex: 'inventory'
+            dataIndex: 'detail'
           },
           {
-            title:'车辆详情',
+            title:'库存',
             align:"center",
-            dataIndex: 'detail'
+            dataIndex: 'inventory'
           },
           {
-            title:'车辆图片(前)',
+            title:'车辆照片(前)',
             align:"center",
-            dataIndex: 'imageFront',
-            scopedSlots: {customRender: 'imgSlot'}
+            dataIndex: 'imageFront'
           },
           {
             title:'车辆照片(后)',
             align:"center",
-            dataIndex: 'imageBack',
-            scopedSlots: {customRender: 'imgSlot'}
+            dataIndex: 'imageBack'
           },
           {
             title:'车辆照片(左)',
             align:"center",
-            dataIndex: 'imageLeft',
-            scopedSlots: {customRender: 'imgSlot'}
+            dataIndex: 'imageLeft'
           },
           {
             title:'车辆照片(右)',
             align:"center",
-            dataIndex: 'imageRight',
-            scopedSlots: {customRender: 'imgSlot'}
+            dataIndex: 'imageRight'
           },
           {
             title:'车辆照片(驾驶室)',
             align:"center",
-            dataIndex: 'imageCab',
-            scopedSlots: {customRender: 'imgSlot'}
+            dataIndex: 'imageCab'
+          },
+          {
+            title:'联系人',
+            align:"center",
+            dataIndex: 'userName'
+          },
+          {
+            title:'联系人电话',
+            align:"center",
+            dataIndex: 'phone'
+          },
+          {
+            title:'所在区域',
+            align:"center",
+            dataIndex: 'area'
+          },
+          {
+            title:'关联商品类型id',
+            align:"center",
+            dataIndex: 'cartypeId_dictText'
           },
           {
-            title:'关联车辆类型id',
+            title:'关联二级分类id',
             align:"center",
-            dataIndex: 'typeId_dictText'
+            dataIndex: 'categorytwoId_dictText'
           },
           {
-            title:'关联车辆分类id',
+            title:'关联用户id',
             align:"center",
-            dataIndex: 'categoryId_dictText'
+            dataIndex: 'userId_dictText'
           },
           {
             title: '操作',
@@ -220,11 +240,11 @@
           }
         ],
         url: {
-          list: "/carrentCar/carrentCar/list",
-          delete: "/carrentCar/carrentCar/delete",
-          deleteBatch: "/carrentCar/carrentCar/deleteBatch",
-          exportXlsUrl: "/carrentCar/carrentCar/exportXls",
-          importExcelUrl: "carrentCar/carrentCar/importExcel",
+          list: "/carrentGoods/carrentGoods/list",
+          delete: "/carrentGoods/carrentGoods/delete",
+          deleteBatch: "/carrentGoods/carrentGoods/deleteBatch",
+          exportXlsUrl: "/carrentGoods/carrentGoods/exportXls",
+          importExcelUrl: "carrentGoods/carrentGoods/importExcel",
           
         },
         dictOptions:{},
@@ -244,22 +264,27 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'name',text:'车辆名称',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'price',text:'车辆价格',dictCode:''})
+        fieldList.push({type:'string',value:'goodsName',text:'商品名称',dictCode:''})
+        fieldList.push({type:'string',value:'image',text:'商品图片',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'price',text:'商品价格',dictCode:''})
         fieldList.push({type:'int',value:'views',text:'浏览量',dictCode:''})
         fieldList.push({type:'string',value:'brand',text:'品牌',dictCode:''})
-        fieldList.push({type:'date',value:'carTime',text:'时间'})
+        fieldList.push({type:'date',value:'goodsTime',text:'时间'})
         fieldList.push({type:'int',value:'mileage',text:'公里数',dictCode:''})
         fieldList.push({type:'string',value:'model',text:'型号',dictCode:''})
-        fieldList.push({type:'int',value:'inventory',text:'车辆库存',dictCode:''})
-        fieldList.push({type:'Text',value:'detail',text:'车辆详情',dictCode:''})
-        fieldList.push({type:'string',value:'imageFront',text:'车辆图片(前)',dictCode:''})
+        fieldList.push({type:'Text',value:'detail',text:'详情',dictCode:''})
+        fieldList.push({type:'int',value:'inventory',text:'库存',dictCode:''})
+        fieldList.push({type:'string',value:'imageFront',text:'车辆照片(前)',dictCode:''})
         fieldList.push({type:'string',value:'imageBack',text:'车辆照片(后)',dictCode:''})
         fieldList.push({type:'string',value:'imageLeft',text:'车辆照片(左)',dictCode:''})
         fieldList.push({type:'string',value:'imageRight',text:'车辆照片(右)',dictCode:''})
         fieldList.push({type:'string',value:'imageCab',text:'车辆照片(驾驶室)',dictCode:''})
-        fieldList.push({type:'string',value:'typeId',text:'关联车辆类型id',dictCode:"carrent_type,name,id"})
-        fieldList.push({type:'string',value:'categoryId',text:'关联车辆分类id',dictCode:"carrent_category,name,id"})
+        fieldList.push({type:'string',value:'userName',text:'联系人',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'联系人电话',dictCode:''})
+        fieldList.push({type:'string',value:'area',text:'所在区域',dictCode:''})
+        fieldList.push({type:'string',value:'cartypeId',text:'关联商品类型id',dictCode:"carrent_type,name,id"})
+        fieldList.push({type:'string',value:'categorytwoId',text:'关联二级分类id',dictCode:"carrent_categorytwo,name,id"})
+        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/carrentCar/vue/modules/CarrentCarForm.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue/modules/CarrentGoodsForm.vue

@@ -4,13 +4,18 @@
       <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="name">
-              <a-input v-model="model.name" placeholder="请输入车辆名称"  ></a-input>
+            <a-form-model-item label="商品名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsName">
+              <a-input v-model="model.goodsName" placeholder="请输入商品名称"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="车辆价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
-              <a-input-number v-model="model.price" placeholder="请输入车辆价格" style="width: 100%" />
+            <a-form-model-item label="商品图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
+              <a-input v-model="model.image" placeholder="请输入商品图片"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="商品价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
+              <a-input-number v-model="model.price" placeholder="请输入商品价格" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -24,8 +29,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="carTime">
-              <j-date placeholder="请选择时间" v-model="model.carTime"  style="width: 100%" />
+            <a-form-model-item label="时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsTime">
+              <j-date placeholder="请选择时间" v-model="model.goodsTime"  style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -39,48 +44,68 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="车辆库存" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inventory">
-              <a-input-number v-model="model.inventory" placeholder="请输入车辆库存" style="width: 100%" />
+            <a-form-model-item label="详情" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="detail">
+              <a-input v-model="model.detail" placeholder="请输入详情"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="车辆详情" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="detail">
-              <a-input v-model="model.detail" placeholder="请输入车辆详情"  ></a-input>
+            <a-form-model-item label="库存" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inventory">
+              <a-input-number v-model="model.inventory" placeholder="请输入库存" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="车辆图片(前)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageFront">
-              <j-image-upload isMultiple  v-model="model.imageFront" ></j-image-upload>
+            <a-form-model-item label="车辆照片(前)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageFront">
+              <a-input v-model="model.imageFront" placeholder="请输入车辆照片(前)"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="车辆照片(后)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageBack">
-              <j-image-upload isMultiple  v-model="model.imageBack" ></j-image-upload>
+              <a-input v-model="model.imageBack" placeholder="请输入车辆照片(后)"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="车辆照片(左)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageLeft">
-              <j-image-upload isMultiple  v-model="model.imageLeft" ></j-image-upload>
+              <a-input v-model="model.imageLeft" placeholder="请输入车辆照片(左)"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="车辆照片(右)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageRight">
-              <j-image-upload isMultiple  v-model="model.imageRight" ></j-image-upload>
+              <a-input v-model="model.imageRight" placeholder="请输入车辆照片(右)"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="车辆照片(驾驶室)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageCab">
-              <j-image-upload isMultiple  v-model="model.imageCab" ></j-image-upload>
+              <a-input v-model="model.imageCab" placeholder="请输入车辆照片(驾驶室)"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="联系人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userName">
+              <a-input v-model="model.userName" placeholder="请输入联系人"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="联系人电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
+              <a-input v-model="model.phone" placeholder="请输入联系人电话"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="所在区域" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="area">
+              <a-input v-model="model.area" placeholder="请输入所在区域"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="关联商品类型id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cartypeId">
+              <j-dict-select-tag type="list" v-model="model.cartypeId" dictCode="carrent_type,name,id" placeholder="请选择关联商品类型id" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="关联车辆类型id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typeId">
-              <j-dict-select-tag type="list" v-model="model.typeId" dictCode="carrent_type,name,id" placeholder="请选择关联车辆类型id" />
+            <a-form-model-item label="关联二级分类id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="categorytwoId">
+              <j-dict-select-tag type="list" v-model="model.categorytwoId" dictCode="carrent_categorytwo,name,id" placeholder="请选择关联二级分类id" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="关联车辆分类id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="categoryId">
-              <j-dict-select-tag type="list" v-model="model.categoryId" dictCode="carrent_category,name,id" placeholder="请选择关联车辆分类id" />
+            <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" />
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -95,7 +120,7 @@
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
-    name: 'CarrentCarForm',
+    name: 'CarrentGoodsForm',
     components: {
     },
     props: {
@@ -122,9 +147,9 @@
         validatorRules: {
         },
         url: {
-          add: "/carrentCar/carrentCar/add",
-          edit: "/carrentCar/carrentCar/edit",
-          queryById: "/carrentCar/carrentCar/queryById"
+          add: "/carrentGoods/carrentGoods/add",
+          edit: "/carrentGoods/carrentGoods/edit",
+          queryById: "/carrentGoods/carrentGoods/queryById"
         }
       }
     },

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue/modules/CarrentCategoryModal.Style#Drawer.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue/modules/CarrentGoodsModal.Style#Drawer.vue

@@ -7,7 +7,7 @@
     @close="close"
     destroyOnClose
     :visible="visible">
-    <carrent-category-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></carrent-category-form>
+    <carrent-goods-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></carrent-goods-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>
@@ -17,12 +17,12 @@
 
 <script>
 
-  import CarrentCategoryForm from './CarrentCategoryForm'
+  import CarrentGoodsForm from './CarrentGoodsForm'
 
   export default {
-    name: 'CarrentCategoryModal',
+    name: 'CarrentGoodsModal',
     components: {
-      CarrentCategoryForm
+      CarrentGoodsForm
     },
     data () {
       return {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue/modules/CarrentCategoryModal.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue/modules/CarrentGoodsModal.vue

@@ -8,17 +8,17 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <carrent-category-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></carrent-category-form>
+    <carrent-goods-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></carrent-goods-form>
   </j-modal>
 </template>
 
 <script>
 
-  import CarrentCategoryForm from './CarrentCategoryForm'
+  import CarrentGoodsForm from './CarrentGoodsForm'
   export default {
-    name: 'CarrentCategoryModal',
+    name: 'CarrentGoodsModal',
     components: {
-      CarrentCategoryForm
+      CarrentGoodsForm
     },
     data () {
       return {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/vue3/CarrentCategory.api.ts → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue3/CarrentGoods.api.ts

@@ -2,13 +2,13 @@ import {defHttp} from '/@/utils/http/axios';
 import {Modal} from 'ant-design-vue';
 
 enum Api {
-  list = '/carrentCategory/carrentCategory/list',
-  save='/carrentCategory/carrentCategory/add',
-  edit='/carrentCategory/carrentCategory/edit',
-  deleteOne = '/carrentCategory/carrentCategory/delete',
-  deleteBatch = '/carrentCategory/carrentCategory/deleteBatch',
-  importExcel = '/carrentCategory/carrentCategory/importExcel',
-  exportXls = '/carrentCategory/carrentCategory/exportXls',
+  list = '/carrentGoods/carrentGoods/list',
+  save='/carrentGoods/carrentGoods/add',
+  edit='/carrentGoods/carrentGoods/edit',
+  deleteOne = '/carrentGoods/carrentGoods/delete',
+  deleteBatch = '/carrentGoods/carrentGoods/deleteBatch',
+  importExcel = '/carrentGoods/carrentGoods/importExcel',
+  exportXls = '/carrentGoods/carrentGoods/exportXls',
 }
 /**
  * 导出api

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue3/CarrentCar.data.ts → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue3/CarrentGoods.data.ts

@@ -5,12 +5,17 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
     {
-    title: '车辆名称',
+    title: '商品名称',
     align:"center",
-    dataIndex: 'name'
+    dataIndex: 'goodsName'
    },
    {
-    title: '车辆价格',
+    title: '商品图片',
+    align:"center",
+    dataIndex: 'image'
+   },
+   {
+    title: '商品价格',
     align:"center",
     dataIndex: 'price'
    },
@@ -27,7 +32,7 @@ export const columns: BasicColumn[] = [
    {
     title: '时间',
     align:"center",
-    dataIndex: 'carTime',
+    dataIndex: 'goodsTime',
     customRender:({text}) =>{
       return !text?"":(text.length>10?text.substr(0,10):text)
     },
@@ -43,54 +48,69 @@ export const columns: BasicColumn[] = [
     dataIndex: 'model'
    },
    {
-    title: '车辆库存',
+    title: '详情',
     align:"center",
-    dataIndex: 'inventory'
+    dataIndex: 'detail'
    },
    {
-    title: '车辆详情',
+    title: '库存',
     align:"center",
-    dataIndex: 'detail'
+    dataIndex: 'inventory'
    },
    {
-    title: '车辆图片(前)',
+    title: '车辆照片(前)',
     align:"center",
-    dataIndex: 'imageFront',
-    customRender:render.renderAvatar,
+    dataIndex: 'imageFront'
    },
    {
     title: '车辆照片(后)',
     align:"center",
-    dataIndex: 'imageBack',
-    customRender:render.renderAvatar,
+    dataIndex: 'imageBack'
    },
    {
     title: '车辆照片(左)',
     align:"center",
-    dataIndex: 'imageLeft',
-    customRender:render.renderAvatar,
+    dataIndex: 'imageLeft'
    },
    {
     title: '车辆照片(右)',
     align:"center",
-    dataIndex: 'imageRight',
-    customRender:render.renderAvatar,
+    dataIndex: 'imageRight'
    },
    {
     title: '车辆照片(驾驶室)',
     align:"center",
-    dataIndex: 'imageCab',
-    customRender:render.renderAvatar,
+    dataIndex: 'imageCab'
+   },
+   {
+    title: '联系人',
+    align:"center",
+    dataIndex: 'userName'
+   },
+   {
+    title: '联系人电话',
+    align:"center",
+    dataIndex: 'phone'
    },
    {
-    title: '关联车辆类型id',
+    title: '所在区域',
     align:"center",
-    dataIndex: 'typeId_dictText'
+    dataIndex: 'area'
    },
    {
-    title: '关联车辆分类id',
+    title: '关联商品类型id',
     align:"center",
-    dataIndex: 'categoryId_dictText'
+    dataIndex: 'cartypeId_dictText'
+   },
+   {
+    title: '关联二级分类id',
+    align:"center",
+    dataIndex: 'categorytwoId_dictText'
+   },
+   {
+    title: '关联用户id',
+    align:"center",
+    dataIndex: 'userId_dictText'
    },
 ];
 //查询数据
@@ -99,12 +119,17 @@ export const searchFormSchema: FormSchema[] = [
 //表单数据
 export const formSchema: FormSchema[] = [
   {
-    label: '车辆名称',
-    field: 'name',
+    label: '商品名称',
+    field: 'goodsName',
     component: 'Input',
   },
   {
-    label: '车辆价格',
+    label: '商品图片',
+    field: 'image',
+    component: 'Input',
+  },
+  {
+    label: '商品价格',
     field: 'price',
     component: 'InputNumber',
   },
@@ -120,7 +145,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     label: '时间',
-    field: 'carTime',
+    field: 'goodsTime',
     component: 'DatePicker',
   },
   {
@@ -134,64 +159,77 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
   },
   {
-    label: '车辆库存',
-    field: 'inventory',
-    component: 'InputNumber',
-  },
-  {
-    label: '车辆详情',
+    label: '详情',
     field: 'detail',
     component: 'Input',
   },
   {
-    label: '车辆图片(前)',
+    label: '库存',
+    field: 'inventory',
+    component: 'InputNumber',
+  },
+  {
+    label: '车辆照片(前)',
     field: 'imageFront',
-     component: 'JImageUpload',
-     componentProps:{
-      },
+    component: 'Input',
   },
   {
     label: '车辆照片(后)',
     field: 'imageBack',
-     component: 'JImageUpload',
-     componentProps:{
-      },
+    component: 'Input',
   },
   {
     label: '车辆照片(左)',
     field: 'imageLeft',
-     component: 'JImageUpload',
-     componentProps:{
-      },
+    component: 'Input',
   },
   {
     label: '车辆照片(右)',
     field: 'imageRight',
-     component: 'JImageUpload',
-     componentProps:{
-      },
+    component: 'Input',
   },
   {
     label: '车辆照片(驾驶室)',
     field: 'imageCab',
-     component: 'JImageUpload',
-     componentProps:{
-      },
+    component: 'Input',
+  },
+  {
+    label: '联系人',
+    field: 'userName',
+    component: 'Input',
+  },
+  {
+    label: '联系人电话',
+    field: 'phone',
+    component: 'Input',
+  },
+  {
+    label: '所在区域',
+    field: 'area',
+    component: 'Input',
   },
   {
-    label: '关联车辆类型id',
-    field: 'typeId',
+    label: '关联商品类型id',
+    field: 'cartypeId',
     component: 'JDictSelectTag',
     componentProps:{
         dictCode:"carrent_type,name,id"
      },
   },
   {
-    label: '关联车辆分类id',
-    field: 'categoryId',
+    label: '关联二级分类id',
+    field: 'categorytwoId',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"carrent_categorytwo,name,id"
+     },
+  },
+  {
+    label: '关联用户id',
+    field: 'userId',
     component: 'JDictSelectTag',
     componentProps:{
-        dictCode:"carrent_category,name,id"
+        dictCode:"han_hai_member,nick_name,id"
      },
   },
 ];

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

@@ -35,25 +35,25 @@
       </template>
     </BasicTable>
     <!-- 表单区域 -->
-    <CarrentMileageModal @register="registerModal" @success="handleSuccess"></CarrentMileageModal>
+    <CarrentGoodsModal @register="registerModal" @success="handleSuccess"></CarrentGoodsModal>
   </div>
 </template>
 
-<script lang="ts" name="carrentMileage-carrentMileage" setup>
+<script lang="ts" name="carrentGoods-carrentGoods" 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';
+  import CarrentGoodsModal from './components/CarrentGoodsModal.vue'
+  import {columns, searchFormSchema} from './carrentGoods.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './carrentGoods.api';
   const checkedKeys = ref<Array<string | number>>([]);
   //注册model
   const [registerModal, {openModal}] = useModal();
   //注册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/carrentCategory/vue3/components/CarrentCategoryModal.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue3/components/CarrentGoodsModal.vue

@@ -8,8 +8,8 @@
     import {ref, computed, unref} from 'vue';
     import {BasicModal, useModalInner} from '/@/components/Modal';
     import {BasicForm, useForm} from '/@/components/Form/index';
-    import {formSchema} from '../carrentCategory.data';
-    import {saveOrUpdate} from '../carrentCategory.api';
+    import {formSchema} from '../carrentGoods.data';
+    import {saveOrUpdate} from '../carrentGoods.api';
     // Emits声明
     const emit = defineEmits(['register','success']);
     const isUpdate = ref(true);

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

@@ -1,17 +0,0 @@
-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-11-12
- * @Version: V1.0
- */
-public interface CarrentMileageMapper extends BaseMapper<CarrentMileage> {
-
-}

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

@@ -1,14 +0,0 @@
-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-11-12
- * @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

@@ -1,19 +0,0 @@
-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-11-12
- * @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/carrentNews/controller/CarrentNewsController.java

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/entity/CarrentNews.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 新闻信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-12
+ * @Date:   2024-12-17
  * @Version: V1.0
  */
 @Data
@@ -51,6 +51,14 @@ public class CarrentNews implements Serializable {
 	@Excel(name = "新闻标题", width = 15)
     @ApiModelProperty(value = "新闻标题")
     private java.lang.String title;
+	/**新闻封面*/
+	@Excel(name = "新闻封面", width = 15)
+    @ApiModelProperty(value = "新闻封面")
+    private java.lang.String image;
+	/**新闻描述*/
+	@Excel(name = "新闻描述", width = 15)
+    @ApiModelProperty(value = "新闻描述")
+    private java.lang.String description;
 	/**新闻内容*/
 	@Excel(name = "新闻内容", width = 15)
     @ApiModelProperty(value = "新闻内容")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/mapper/CarrentNewsMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 新闻信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-12
+ * @Date:   2024-12-17
  * @Version: V1.0
  */
 public interface CarrentNewsMapper extends BaseMapper<CarrentNews> {

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 新闻信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-12
+ * @Date:   2024-12-17
  * @Version: V1.0
  */
 public interface ICarrentNewsService extends IService<CarrentNews> {

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

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue/CarrentNewsList.vue

@@ -126,10 +126,22 @@
             align:"center",
             dataIndex: 'title'
           },
+          {
+            title:'新闻封面',
+            align:"center",
+            dataIndex: 'image',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'新闻描述',
+            align:"center",
+            dataIndex: 'description'
+          },
           {
             title:'新闻内容',
             align:"center",
-            dataIndex: 'content'
+            dataIndex: 'content',
+            scopedSlots: {customRender: 'htmlSlot'}
           },
           {
             title: '操作',
@@ -166,6 +178,8 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'title',text:'新闻标题',dictCode:''})
+        fieldList.push({type:'string',value:'image',text:'新闻封面',dictCode:''})
+        fieldList.push({type:'Text',value:'description',text:'新闻描述',dictCode:''})
         fieldList.push({type:'Text',value:'content',text:'新闻内容',dictCode:''})
         this.superFieldList = fieldList
       }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue/modules/CarrentNewsForm.vue

@@ -8,9 +8,19 @@
               <a-input v-model="model.title" placeholder="请输入新闻标题"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="新闻封面" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
+              <j-image-upload isMultiple  v-model="model.image" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="新闻描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description">
+              <a-input v-model="model.description" placeholder="请输入新闻描述"  ></a-input>
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="新闻内容" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="content">
-              <a-input v-model="model.content" placeholder="请输入新闻内容"  ></a-input>
+              <j-editor v-model="model.content" />
             </a-form-model-item>
           </a-col>
         </a-row>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentNews/vue3/CarrentNews.data.ts

@@ -9,10 +9,22 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'title'
    },
+   {
+    title: '新闻封面',
+    align:"center",
+    dataIndex: 'image',
+    customRender:render.renderAvatar,
+   },
+   {
+    title: '新闻描述',
+    align:"center",
+    dataIndex: 'description'
+   },
    {
     title: '新闻内容',
     align:"center",
-    dataIndex: 'content'
+    dataIndex: 'content',
+    slots: { customRender: 'htmlSlot' },
    },
 ];
 //查询数据
@@ -25,9 +37,21 @@ export const formSchema: FormSchema[] = [
     field: 'title',
     component: 'Input',
   },
+  {
+    label: '新闻封面',
+    field: 'image',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '新闻描述',
+    field: 'description',
+    component: 'Input',
+  },
   {
     label: '新闻内容',
     field: 'content',
-    component: 'Input',
+    component: 'JCodeEditor', //TODO String后缀暂未添加
   },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/controller/CarrentOrderController.java

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/entity/CarrentOrder.java

@@ -4,13 +4,15 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.jeecg.modules.carrentCar.entity.CarrentCar;
+import org.jeecg.modules.carrentGoods.entity.CarrentGoods;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -22,7 +24,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 预约信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-03
+ * @Date:   2024-12-12
  * @Version: V1.0
  */
 @Data
@@ -61,23 +63,23 @@ public class CarrentOrder implements Serializable {
 	@Excel(name = "所在区域", width = 15)
     @ApiModelProperty(value = "所在区域")
     private java.lang.String area;
-	/**关联车辆类型*/
-	@Excel(name = "关联车辆类型", width = 15, dictTable = "carrent_type", dicText = "name", dicCode = "id")
+	/**关联商品类型*/
+	@Excel(name = "关联商品类型", width = 15, dictTable = "carrent_type", dicText = "name", dicCode = "id")
 	@Dict(dictTable = "carrent_type", dicText = "name", dicCode = "id")
-    @ApiModelProperty(value = "关联车辆类型")
+    @ApiModelProperty(value = "关联商品类型")
     private java.lang.String typeId;
 	/**关联商品*/
-	@Excel(name = "关联商品", width = 15, dictTable = "carrent_car", dicText = "name", dicCode = "id")
-	@Dict(dictTable = "carrent_car", dicText = "name", dicCode = "id")
+	@Excel(name = "关联商品", width = 15, dictTable = "carrent_goods", dicText = "goods_name", dicCode = "id")
+	@Dict(dictTable = "carrent_goods", dicText = "goods_name", dicCode = "id")
     @ApiModelProperty(value = "关联商品")
-    private java.lang.String carId;
+    private java.lang.String goodsId;
 	/**关联用户*/
 	@Excel(name = "关联用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
 	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "关联用户")
     private java.lang.String userId;
 
-    //车辆信息
+    //商品信息
     @TableField(exist = false)
-    private CarrentCar carrentCar;
+    private CarrentGoods carrentGoods;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/mapper/CarrentOrderMapper.java

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

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

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

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

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