diff --git a/admin-hanhai-vue/src/views/carrentCategoryOne/CarrentCategoryoneList.vue b/admin-hanhai-vue/src/views/carrentCategoryOne/CarrentCategoryoneList.vue
new file mode 100644
index 0000000..03a1855
--- /dev/null
+++ b/admin-hanhai-vue/src/views/carrentCategoryOne/CarrentCategoryoneList.vue
@@ -0,0 +1,176 @@
+<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-categoryone-modal ref="modalForm" @ok="modalFormOk"></carrent-categoryone-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CarrentCategoryoneModal from './modules/CarrentCategoryoneModal'
+
+  export default {
+    name: 'CarrentCategoryoneList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CarrentCategoryoneModal
+    },
+    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: 'id'
+          },
+          {
+            title:'一级分类名称',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/carrentCategoryone/carrentCategoryone/list",
+          delete: "/carrentCategoryone/carrentCategoryone/delete",
+          deleteBatch: "/carrentCategoryone/carrentCategoryone/deleteBatch",
+          exportXlsUrl: "/carrentCategoryone/carrentCategoryone/exportXls",
+          importExcelUrl: "carrentCategoryone/carrentCategoryone/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:'name',text:'一级分类名称',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/carrentCategoryOne/modules/CarrentCategoryoneForm.vue b/admin-hanhai-vue/src/views/carrentCategoryOne/modules/CarrentCategoryoneForm.vue
new file mode 100644
index 0000000..b2b1196
--- /dev/null
+++ b/admin-hanhai-vue/src/views/carrentCategoryOne/modules/CarrentCategoryoneForm.vue
@@ -0,0 +1,104 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="一级分类名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" placeholder="请输入一级分类名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'CarrentCategoryoneForm',
+    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: "/carrentCategoryone/carrentCategoryone/add",
+          edit: "/carrentCategoryone/carrentCategoryone/edit",
+          queryById: "/carrentCategoryone/carrentCategoryone/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/carrentCategoryOne/modules/CarrentCategoryoneModal.Style#Drawer.vue b/admin-hanhai-vue/src/views/carrentCategoryOne/modules/CarrentCategoryoneModal.Style#Drawer.vue
new file mode 100644
index 0000000..3e850b3
--- /dev/null
+++ b/admin-hanhai-vue/src/views/carrentCategoryOne/modules/CarrentCategoryoneModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <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>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import CarrentCategoryoneForm from './CarrentCategoryoneForm'
+
+  export default {
+    name: 'CarrentCategoryoneModal',
+    components: {
+      CarrentCategoryoneForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/carrentCategoryOne/modules/CarrentCategoryoneModal.vue b/admin-hanhai-vue/src/views/carrentCategoryOne/modules/CarrentCategoryoneModal.vue
new file mode 100644
index 0000000..37d1aeb
--- /dev/null
+++ b/admin-hanhai-vue/src/views/carrentCategoryOne/modules/CarrentCategoryoneModal.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-categoryone-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></carrent-categoryone-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CarrentCategoryoneForm from './CarrentCategoryoneForm'
+  export default {
+    name: 'CarrentCategoryoneModal',
+    components: {
+      CarrentCategoryoneForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/controller/CarrentTypeController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/controller/CarrentTypeController.java
index 2ae1194..e66aec1 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/controller/CarrentTypeController.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/controller/CarrentTypeController.java
@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 商品类型表
  * @Author: jeecg-boot
- * @Date:   2024-12-12
+ * @Date:   2025-01-03
  * @Version: V1.0
  */
 @Api(tags="商品类型表")
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/entity/CarrentType.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/entity/CarrentType.java
index 915fcb2..a1eb5ee 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/entity/CarrentType.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/entity/CarrentType.java
@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 商品类型表
  * @Author: jeecg-boot
- * @Date:   2024-12-12
+ * @Date:   2025-01-03
  * @Version: V1.0
  */
 @Data
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/mapper/CarrentTypeMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/mapper/CarrentTypeMapper.java
index 652cc1f..a16864c 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/mapper/CarrentTypeMapper.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/mapper/CarrentTypeMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 商品类型表
  * @Author: jeecg-boot
- * @Date:   2024-12-12
+ * @Date:   2025-01-03
  * @Version: V1.0
  */
 public interface CarrentTypeMapper extends BaseMapper<CarrentType> {
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/service/ICarrentTypeService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/service/ICarrentTypeService.java
index 9e8a636..16e03db 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/service/ICarrentTypeService.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/service/ICarrentTypeService.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 商品类型表
  * @Author: jeecg-boot
- * @Date:   2024-12-12
+ * @Date:   2025-01-03
  * @Version: V1.0
  */
 public interface ICarrentTypeService extends IService<CarrentType> {
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/service/impl/CarrentTypeServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/service/impl/CarrentTypeServiceImpl.java
index cb1af8d..217cb58 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/service/impl/CarrentTypeServiceImpl.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentType/service/impl/CarrentTypeServiceImpl.java
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 商品类型表
  * @Author: jeecg-boot
- * @Date:   2024-12-12
+ * @Date:   2025-01-03
  * @Version: V1.0
  */
 @Service
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/ConfigController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/ConfigController.java
index aba70c4..7f31ce7 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/ConfigController.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/ConfigController.java
@@ -22,6 +22,11 @@ public class ConfigController {
     @Resource
     private ConfigService configService;
     /****************************************************************************************************/
+    @ApiOperation(value="配置信息-获取活动模块列表", notes="配置信息-获取活动模块列表")
+    @RequestMapping(value = "/queryModuleList", method = {RequestMethod.GET})
+    public Result<?> queryModuleList(PageBean pageBean){
+        return configService.queryModuleList(pageBean);
+    }
 
     @ApiOperation(value="配置信息-获取商品类型列表", notes="配置信息-获取商品类型列表")
     @RequestMapping(value = "/queryTypeList", method = {RequestMethod.GET})
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ConfigService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ConfigService.java
index 768a9a5..fd03d91 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ConfigService.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ConfigService.java
@@ -5,6 +5,13 @@ import org.jeecg.modules.apiBean.PageBean;
 
 public interface ConfigService {
 
+    /**
+     * 配置信息-获取活动模块列表
+     * @param pageBean
+     * @return
+     */
+    public Result<?> queryModuleList(PageBean pageBean);
+
     /**
      * 配置信息-获取商品类型列表
      * @param pageBean
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java
index eb22c77..6cf6fb3 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java
@@ -13,6 +13,8 @@ import org.jeecg.modules.carrentConfig.entity.CarrentConfig;
 import org.jeecg.modules.carrentConfig.service.ICarrentConfigService;
 import org.jeecg.modules.carrentMileage.entity.CarrentMileage;
 import org.jeecg.modules.carrentMileage.service.ICarrentMileageService;
+import org.jeecg.modules.carrentModule.entity.CarrentModule;
+import org.jeecg.modules.carrentModule.service.ICarrentModuleService;
 import org.jeecg.modules.carrentOrder.entity.CarrentOrder;
 import org.jeecg.modules.carrentType.entity.CarrentType;
 import org.jeecg.modules.carrentType.service.ICarrentTypeService;
@@ -30,6 +32,10 @@ public class ConfigServiceImpl implements ConfigService {
     @Resource
     private ICarrentMileageService carrentMileageService;
 
+    //活动模块
+    @Resource
+    private ICarrentModuleService carrentModuleService;
+
     //商品类型
     @Resource
     private ICarrentTypeService carrentTypeService;
@@ -46,6 +52,38 @@ public class ConfigServiceImpl implements ConfigService {
     @Resource
     private ICarrentConfigService carrentConfigService;
     /*************************************************************************************/
+    //配置信息-获取活动模块列表
+    @Override
+    public Result<?> queryModuleList(PageBean pageBean) {
+        //返回信息
+        String message = "活动模块列表查询失败!";
+        //商品类型列表
+        Page<CarrentModule> pageList = null;
+
+        try{
+            //分页
+            Page<CarrentModule> page = new Page<CarrentModule>(pageBean.getPageNo(), pageBean.getPageSize());
+            //获取活动模块列表
+            pageList = carrentModuleService
+                    .lambdaQuery()
+                    .page(page);
+
+            //判断执行结果
+            if(null != pageList){
+                message = "活动模块列表信息";
+            }else {
+                message = "活动模块列表为空";
+            }
+
+            //返回执行结果
+            return Result.OK(message, pageList);
+        }catch (Exception e){
+            //错误信息打印
+            e.printStackTrace();
+            return Result.error(message, pageList);
+        }
+
+    }
 
     //配置信息-获取商品类型列表
     @Override