diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/App.java b/kqapi/src/main/java/com/ningdatech/kqapi/App.java
index 0daeacc..85ee652 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/App.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/App.java
@@ -1,7 +1,7 @@
 package com.ningdatech.kqapi;
 
+import com.ningdatech.basic.util.SpringUtils;
 import com.ningdatech.kqapi.common.util.SpringContextHolder;
-import com.ningdatech.kqapi.common.util.SpringUtils;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/controller/WindowController.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/controller/WindowController.java
new file mode 100644
index 0000000..31c1807
--- /dev/null
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/controller/WindowController.java
@@ -0,0 +1,61 @@
+package com.ningdatech.kqapi.admin.controller;
+
+
+import com.ningdatech.basic.model.IdVo;
+import com.ningdatech.kqapi.admin.manage.WindowManage;
+import com.ningdatech.kqapi.admin.model.req.ListWindowReq;
+import com.ningdatech.kqapi.admin.model.req.WindowSaveReq;
+import com.ningdatech.kqapi.admin.model.vo.WindowDetailVO;
+import com.ningdatech.log.annotation.WebLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author WendyYang
+ * @since 2024-04-20
+ */
+@Api(tags = "窗口管理")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/api/v1/window")
+public class WindowController {
+
+    private final WindowManage windowManage;
+
+    @PostMapping("/save")
+    @WebLog("窗口新增或修改")
+    @ApiOperation("窗口新增或修改")
+    public void saveOrUpdate(@RequestBody WindowSaveReq req) {
+        windowManage.windowSaveOrUpdate(req);
+    }
+
+    @DeleteMapping("/del")
+    @WebLog("窗口删除")
+    @ApiOperation("窗口删除")
+    public void delete(@RequestBody IdVo<Integer> id) {
+        windowManage.delete(id);
+    }
+
+    @GetMapping("/page")
+    @WebLog("窗口列表")
+    @ApiOperation("窗口列表")
+    public void page(ListWindowReq req) {
+        windowManage.pageWindow(req);
+    }
+
+    @GetMapping("/option")
+    @WebLog("窗口下拉选择")
+    @ApiOperation("窗口下拉选择")
+    public List<WindowDetailVO> option(ListWindowReq req) {
+        return windowManage.windowOption(req);
+    }
+
+}
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/controller/ZoneController.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/controller/ZoneController.java
new file mode 100644
index 0000000..0bb196e
--- /dev/null
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/controller/ZoneController.java
@@ -0,0 +1,60 @@
+package com.ningdatech.kqapi.admin.controller;
+
+
+import com.ningdatech.basic.model.IdVo;
+import com.ningdatech.basic.model.PageVo;
+import com.ningdatech.kqapi.admin.manage.ZoneManage;
+import com.ningdatech.kqapi.admin.model.req.ListZoneReq;
+import com.ningdatech.kqapi.admin.model.req.ZoneSaveReq;
+import com.ningdatech.kqapi.admin.model.vo.ZoneDetailVO;
+import com.ningdatech.log.annotation.WebLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author WendyYang
+ * @since 2024-04-20
+ */
+@Api(tags = "专区管理")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/api/v1/zone")
+public class ZoneController {
+
+    private final ZoneManage zoneManage;
+
+    @PostMapping("/save")
+    @WebLog("专区保存或修改")
+    @ApiOperation("专区保存或修改")
+    public void zoneSaveOrUpdate(@RequestBody ZoneSaveReq req) {
+        zoneManage.zoneSaveOrUpdate(req);
+    }
+
+    @DeleteMapping("/del")
+    public void delete(@RequestBody IdVo<Integer> id) {
+        zoneManage.delete(id);
+    }
+
+    @GetMapping("/page")
+    @WebLog("专区列表")
+    @ApiOperation("专区列表")
+    public PageVo<ZoneDetailVO> pageZone(ListZoneReq req) {
+        return zoneManage.pageZone(req);
+    }
+
+    @GetMapping("/option")
+    @WebLog("专区下拉选择")
+    @ApiOperation("专区下拉选择")
+    public List<ZoneDetailVO> zoneOption(ListZoneReq req) {
+        return zoneManage.zoneOption(req);
+    }
+
+}
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/manage/WindowManage.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/manage/WindowManage.java
new file mode 100644
index 0000000..d46e69f
--- /dev/null
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/manage/WindowManage.java
@@ -0,0 +1,84 @@
+package com.ningdatech.kqapi.admin.manage;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ningdatech.basic.model.IdVo;
+import com.ningdatech.basic.model.PageVo;
+import com.ningdatech.basic.util.CollUtils;
+import com.ningdatech.kqapi.admin.model.entity.Window;
+import com.ningdatech.kqapi.admin.model.entity.Zone;
+import com.ningdatech.kqapi.admin.model.req.ListWindowReq;
+import com.ningdatech.kqapi.admin.model.req.WindowSaveReq;
+import com.ningdatech.kqapi.admin.model.vo.WindowDetailVO;
+import com.ningdatech.kqapi.admin.service.IWindowService;
+import com.ningdatech.kqapi.admin.service.IZoneService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * WindowManage
+ * </p>
+ *
+ * @author WendyYang
+ * @since 12:17 2024/4/20
+ */
+@Component
+@RequiredArgsConstructor
+public class WindowManage {
+
+    private final IWindowService windowService;
+    private final IZoneService zoneService;
+
+    public void windowSaveOrUpdate(WindowSaveReq req) {
+        Window win = BeanUtil.copyProperties(req, Window.class);
+        windowService.saveOrUpdate(win);
+    }
+
+    public void delete(IdVo<Integer> id) {
+        windowService.removeById(id.getId());
+    }
+
+    public PageVo<WindowDetailVO> pageWindow(ListWindowReq req) {
+        Wrapper<Window> query = buildWindowQuery(req);
+        Page<Window> page = windowService.page(req.page(), query);
+        if (page.getTotal() == 0) {
+            return PageVo.empty();
+        }
+        List<Window> records = page.getRecords();
+        List<Integer> windowIds = CollUtils.fieldList(records, Window::getId);
+        List<WindowDetailVO> data = records.stream().map(w -> {
+            WindowDetailVO window = BeanUtil.copyProperties(w, WindowDetailVO.class);
+            window.setItemCount(0);
+            return window;
+        }).collect(Collectors.toList());
+        return PageVo.of(data, page.getTotal());
+    }
+
+    public List<WindowDetailVO> windowOption(ListWindowReq req) {
+        Wrapper<Window> query = buildWindowQuery(req);
+        Page<Window> page = windowService.page(req.page(), query);
+        if (page.getTotal() == 0) {
+            return Collections.emptyList();
+        }
+        return page.getRecords().stream().map(w -> WindowDetailVO.builder()
+                .windowName(w.getWindowName())
+                .id(w.getId())
+                .build()).collect(Collectors.toList());
+    }
+
+    private static Wrapper<Window> buildWindowQuery(ListWindowReq req) {
+        return Wrappers.lambdaQuery(Window.class)
+                .like(StrUtil.isNotBlank(req.getWindowName()), Window::getWindowName, req.getWindowName())
+                .eq(req.getZoneId() != null, Window::getZoneId, req.getZoneId())
+                .orderByDesc(Window::getUpdateOn);
+    }
+
+}
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/manage/ZoneManage.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/manage/ZoneManage.java
new file mode 100644
index 0000000..4be4204
--- /dev/null
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/manage/ZoneManage.java
@@ -0,0 +1,102 @@
+package com.ningdatech.kqapi.admin.manage;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ningdatech.basic.model.IdVo;
+import com.ningdatech.basic.model.PageVo;
+import com.ningdatech.basic.util.CollUtils;
+import com.ningdatech.kqapi.admin.mapper.ZoneMapper;
+import com.ningdatech.kqapi.admin.model.entity.Window;
+import com.ningdatech.kqapi.admin.model.entity.Zone;
+import com.ningdatech.kqapi.admin.model.req.ListZoneReq;
+import com.ningdatech.kqapi.admin.model.req.ZoneSaveReq;
+import com.ningdatech.kqapi.admin.model.vo.ZoneDetailVO;
+import com.ningdatech.kqapi.admin.service.IWindowService;
+import com.ningdatech.kqapi.admin.service.IZoneService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * ZoneManage
+ * </p>
+ *
+ * @author WendyYang
+ * @since 12:17 2024/4/20
+ */
+@Component
+@RequiredArgsConstructor
+public class ZoneManage {
+
+    private final IZoneService zoneService;
+    private final ZoneMapper zoneMapper;
+    private final IWindowService windowService;
+
+    @Transactional(rollbackFor = Exception.class)
+    public synchronized void zoneSaveOrUpdate(ZoneSaveReq req) {
+        Zone zone = BeanUtil.copyProperties(req, Zone.class);
+        if (zone.getId() != null) {
+            Zone oldZone = zoneService.getById(req.getId());
+            if (!StrUtil.equals(zone.getZoneName(), oldZone.getZoneName())) {
+                Wrapper<Window> wUpdate = Wrappers.lambdaUpdate(Window.class)
+                        .set(Window::getZoneName, req.getZoneName())
+                        .eq(Window::getZoneId, req.getId());
+                windowService.update(wUpdate);
+            }
+        }
+        zoneService.saveOrUpdate(zone);
+    }
+
+
+    public void delete(IdVo<Integer> id) {
+        zoneService.removeById(id.getId());
+    }
+
+    public PageVo<ZoneDetailVO> pageZone(ListZoneReq req) {
+        Wrapper<Zone> query = buildZoneQuery(req);
+        Page<Zone> page = zoneService.page(req.page(), query);
+        if (page.getTotal() == 0) {
+            return PageVo.empty();
+        }
+        List<Zone> records = page.getRecords();
+        List<Integer> zoneIds = CollUtils.fieldList(records, Zone::getId);
+        Map<Integer, Integer> windowCountMap = windowService.windowCountByZoneIds(zoneIds);
+        List<ZoneDetailVO> data = records.stream().map(w -> {
+            ZoneDetailVO zone = BeanUtil.copyProperties(w, ZoneDetailVO.class);
+            zone.setWindowCount(windowCountMap.getOrDefault(w.getId(), 0));
+            return zone;
+        }).collect(Collectors.toList());
+        return PageVo.of(data, page.getTotal());
+    }
+
+    public List<ZoneDetailVO> zoneOption(ListZoneReq req) {
+        Wrapper<Zone> query = buildZoneQuery(req);
+        Page<Zone> page = zoneService.page(req.page(), query);
+        if (page.getTotal() == 0) {
+            return Collections.emptyList();
+        }
+        return CollUtils.convert(page.getRecords(),
+                w -> ZoneDetailVO.builder()
+                        .id(w.getId())
+                        .zoneName(w.getZoneName())
+                        .build());
+    }
+
+    private static Wrapper<Zone> buildZoneQuery(ListZoneReq req) {
+        return Wrappers.lambdaQuery(Zone.class)
+                .like(StrUtil.isNotBlank(req.getZoneName()), Zone::getZoneName, req.getZoneName())
+                .orderByDesc(Zone::getUpdateOn);
+    }
+
+}
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/mapper/WindowMapper.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/mapper/WindowMapper.java
new file mode 100644
index 0000000..5831b18
--- /dev/null
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/mapper/WindowMapper.java
@@ -0,0 +1,23 @@
+package com.ningdatech.kqapi.admin.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ningdatech.kqapi.admin.model.dto.WindowCountByZoneIdDTO;
+import com.ningdatech.kqapi.admin.model.entity.Window;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author WendyYang
+ * @since 2024-04-20
+ */
+public interface WindowMapper extends BaseMapper<Window> {
+
+    List<WindowCountByZoneIdDTO> selectWindowCountByZoneIds(@Param("zoneIds") Collection<Integer> zoneIds);
+
+}
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/mapper/WindowMapper.xml b/kqapi/src/main/java/com/ningdatech/kqapi/admin/mapper/WindowMapper.xml
new file mode 100644
index 0000000..93aef87
--- /dev/null
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/mapper/WindowMapper.xml
@@ -0,0 +1,13 @@
+<?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="com.ningdatech.kqapi.admin.mapper.WindowMapper">
+
+    <select id="selectWindowCountByZoneIds" resultType="com.ningdatech.kqapi.admin.model.dto.WindowCountByZoneIdDTO">
+        select zone_id, count(1) as window_count from nd_window where zone_id in
+        <foreach collection="zoneIds" item="zoneId" open="(" separator="," close=")">
+            #{zoneId}
+        </foreach>
+        group by zone_id
+    </select>
+
+</mapper>
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/mapper/ZoneMapper.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/mapper/ZoneMapper.java
new file mode 100644
index 0000000..3f08445
--- /dev/null
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/mapper/ZoneMapper.java
@@ -0,0 +1,16 @@
+package com.ningdatech.kqapi.admin.mapper;
+
+import com.ningdatech.kqapi.admin.model.entity.Zone;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author WendyYang
+ * @since 2024-04-20
+ */
+public interface ZoneMapper extends BaseMapper<Zone> {
+
+}
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/mapper/ZoneMapper.xml b/kqapi/src/main/java/com/ningdatech/kqapi/admin/mapper/ZoneMapper.xml
new file mode 100644
index 0000000..752a645
--- /dev/null
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/mapper/ZoneMapper.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="com.ningdatech.kqapi.admin.mapper.ZoneMapper">
+
+</mapper>
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/dto/WindowCountByZoneIdDTO.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/dto/WindowCountByZoneIdDTO.java
new file mode 100644
index 0000000..0abf7a0
--- /dev/null
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/dto/WindowCountByZoneIdDTO.java
@@ -0,0 +1,20 @@
+package com.ningdatech.kqapi.admin.model.dto;
+
+import lombok.Data;
+
+/**
+ * <p>
+ * WindowCountByZoneIdDTO
+ * </p>
+ *
+ * @author WendyYang
+ * @since 14:14 2024/4/20
+ */
+@Data
+public class WindowCountByZoneIdDTO {
+
+    private Integer zoneId;
+
+    private Integer windowCount;
+
+}
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/entity/Window.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/entity/Window.java
new file mode 100644
index 0000000..5f78af7
--- /dev/null
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/entity/Window.java
@@ -0,0 +1,54 @@
+package com.ningdatech.kqapi.admin.model.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 窗口对象
+ * </p>
+ *
+ * @author WendyYang
+ * @since 2024-04-20
+ */
+@Data
+@TableName("nd_window")
+@ApiModel(value = "Window对象")
+public class Window implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("窗口名称")
+    private String windowName;
+
+    @ApiModelProperty("专区ID")
+    private Integer zoneId;
+
+    @ApiModelProperty("专区名称")
+    private String zoneName;
+
+    @TableLogic
+    private Boolean deleted;
+
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createOn;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateOn;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateBy;
+
+}
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/entity/Zone.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/entity/Zone.java
new file mode 100644
index 0000000..a5adbed
--- /dev/null
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/entity/Zone.java
@@ -0,0 +1,52 @@
+package com.ningdatech.kqapi.admin.model.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 专区对象
+ * </p>
+ *
+ * @author WendyYang
+ * @since 2024-04-20
+ */
+@Data
+@TableName("nd_zone")
+@ApiModel(value = "Zone对象")
+public class Zone implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("专区名称")
+    private String zoneName;
+
+    @ApiModelProperty("专区图标")
+    private String zoneIcon;
+
+    @TableLogic
+    private Boolean deleted;
+
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createOn;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateOn;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateBy;
+
+}
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/req/ListWindowReq.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/req/ListWindowReq.java
new file mode 100644
index 0000000..05be92b
--- /dev/null
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/req/ListWindowReq.java
@@ -0,0 +1,26 @@
+package com.ningdatech.kqapi.admin.model.req;
+
+import com.ningdatech.kqapi.common.model.PagePo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * WindowSaveReq
+ * </p>
+ *
+ * @author WendyYang
+ * @since 13:25 2024/4/20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ListWindowReq extends PagePo {
+
+    @ApiModelProperty("专区ID")
+    private Integer zoneId;
+
+    @ApiModelProperty("窗口名称")
+    private String windowName;
+
+}
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/req/ListZoneReq.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/req/ListZoneReq.java
new file mode 100644
index 0000000..43c2b11
--- /dev/null
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/req/ListZoneReq.java
@@ -0,0 +1,23 @@
+package com.ningdatech.kqapi.admin.model.req;
+
+import com.ningdatech.kqapi.common.model.PagePo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * ListZoneReq
+ * </p>
+ *
+ * @author WendyYang
+ * @since 13:25 2024/4/20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ListZoneReq extends PagePo {
+
+    @ApiModelProperty("专区名称")
+    private String zoneName;
+
+}
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/req/WindowSaveReq.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/req/WindowSaveReq.java
new file mode 100644
index 0000000..d71352f
--- /dev/null
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/req/WindowSaveReq.java
@@ -0,0 +1,29 @@
+package com.ningdatech.kqapi.admin.model.req;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * WindowSaveReq
+ * </p>
+ *
+ * @author WendyYang
+ * @since 13:25 2024/4/20
+ */
+@Data
+public class WindowSaveReq {
+
+    @ApiModelProperty("窗口ID")
+    private Integer id;
+
+    @ApiModelProperty("专区ID")
+    private Integer zoneId;
+
+    @ApiModelProperty("专区名称")
+    private String zoneName;
+
+    @ApiModelProperty("窗口名称")
+    private String windowName;
+
+}
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/req/ZoneSaveReq.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/req/ZoneSaveReq.java
new file mode 100644
index 0000000..b6ed691
--- /dev/null
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/req/ZoneSaveReq.java
@@ -0,0 +1,26 @@
+package com.ningdatech.kqapi.admin.model.req;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * ZoneSaveReq
+ * </p>
+ *
+ * @author WendyYang
+ * @since 13:25 2024/4/20
+ */
+@Data
+public class ZoneSaveReq {
+
+    @ApiModelProperty("专区ID")
+    private Integer id;
+
+    @ApiModelProperty("专区名称")
+    private String zoneName;
+
+    @ApiModelProperty("专区图标")
+    private String zoneIcon;
+
+}
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/vo/WindowDetailVO.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/vo/WindowDetailVO.java
new file mode 100644
index 0000000..0bf29f5
--- /dev/null
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/vo/WindowDetailVO.java
@@ -0,0 +1,34 @@
+package com.ningdatech.kqapi.admin.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * <p>
+ * WindowDetailVO
+ * </p>
+ *
+ * @author WendyYang
+ * @since 13:47 2024/4/20
+ */
+@Builder
+@Data
+public class WindowDetailVO {
+
+    @ApiModelProperty("窗口ID")
+    private Integer id;
+
+    @ApiModelProperty("窗口名称")
+    private String windowName;
+
+    @ApiModelProperty("专区ID")
+    private Integer zoneId;
+
+    @ApiModelProperty("专区名称")
+    private String zoneName;
+
+    @ApiModelProperty("事项数量")
+    private Integer itemCount;
+
+}
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/vo/ZoneDetailVO.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/vo/ZoneDetailVO.java
new file mode 100644
index 0000000..011bcd8
--- /dev/null
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/vo/ZoneDetailVO.java
@@ -0,0 +1,31 @@
+package com.ningdatech.kqapi.admin.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * <p>
+ * ZoneDetailVO
+ * </p>
+ *
+ * @author WendyYang
+ * @since 13:48 2024/4/20
+ */
+@Data
+@Builder
+public class ZoneDetailVO {
+
+    @ApiModelProperty("专区ID")
+    private Integer id;
+
+    @ApiModelProperty("专区名称")
+    private String zoneName;
+
+    @ApiModelProperty("专区图标")
+    private String zoneIcon;
+
+    @ApiModelProperty("窗口数量")
+    private Integer windowCount;
+
+}
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/service/IWindowService.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/service/IWindowService.java
new file mode 100644
index 0000000..65a10a1
--- /dev/null
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/service/IWindowService.java
@@ -0,0 +1,21 @@
+package com.ningdatech.kqapi.admin.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ningdatech.kqapi.admin.model.entity.Window;
+
+import java.util.Collection;
+import java.util.Map;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author WendyYang
+ * @since 2024-04-20
+ */
+public interface IWindowService extends IService<Window> {
+
+    Map<Integer, Integer> windowCountByZoneIds(Collection<Integer> zoneIds);
+
+}
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/service/IZoneService.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/service/IZoneService.java
new file mode 100644
index 0000000..17644a5
--- /dev/null
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/service/IZoneService.java
@@ -0,0 +1,16 @@
+package com.ningdatech.kqapi.admin.service;
+
+import com.ningdatech.kqapi.admin.model.entity.Zone;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author WendyYang
+ * @since 2024-04-20
+ */
+public interface IZoneService extends IService<Zone> {
+
+}
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/service/impl/WindowServiceImpl.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/service/impl/WindowServiceImpl.java
new file mode 100644
index 0000000..f8d5746
--- /dev/null
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/service/impl/WindowServiceImpl.java
@@ -0,0 +1,38 @@
+package com.ningdatech.kqapi.admin.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ningdatech.basic.util.CollUtils;
+import com.ningdatech.kqapi.admin.mapper.WindowMapper;
+import com.ningdatech.kqapi.admin.model.dto.WindowCountByZoneIdDTO;
+import com.ningdatech.kqapi.admin.model.entity.Window;
+import com.ningdatech.kqapi.admin.service.IWindowService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author WendyYang
+ * @since 2024-04-20
+ */
+@Service
+public class WindowServiceImpl extends ServiceImpl<WindowMapper, Window> implements IWindowService {
+
+    @Override
+    public Map<Integer, Integer> windowCountByZoneIds(Collection<Integer> zoneIds) {
+        if (CollUtil.isEmpty(zoneIds)) {
+            return Collections.emptyMap();
+        }
+        List<WindowCountByZoneIdDTO> counts = baseMapper.selectWindowCountByZoneIds(zoneIds);
+        return CollUtils.listToMap(counts, WindowCountByZoneIdDTO::getZoneId,
+                WindowCountByZoneIdDTO::getWindowCount);
+    }
+
+}
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/service/impl/ZoneServiceImpl.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/service/impl/ZoneServiceImpl.java
new file mode 100644
index 0000000..ef69a5e
--- /dev/null
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/service/impl/ZoneServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ningdatech.kqapi.admin.service.impl;
+
+import com.ningdatech.kqapi.admin.model.entity.Zone;
+import com.ningdatech.kqapi.admin.mapper.ZoneMapper;
+import com.ningdatech.kqapi.admin.service.IZoneService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author WendyYang
+ * @since 2024-04-20
+ */
+@Service
+public class ZoneServiceImpl extends ServiceImpl<ZoneMapper, Zone> implements IZoneService {
+
+}
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/common/config/BeanConfig.java b/kqapi/src/main/java/com/ningdatech/kqapi/common/config/BeanConfig.java
index cc05b5a..7d5c11c 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/common/config/BeanConfig.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/common/config/BeanConfig.java
@@ -7,7 +7,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.ningdatech.kqapi.common.util.NdDateUtils;
 import com.ningdatech.kqapi.common.util.NdJacksonModule;
-import com.ningdatech.kqapi.common.util.SpringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.Header;
 import org.apache.http.client.HttpClient;
@@ -21,11 +20,9 @@ import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
-import org.springframework.core.convert.converter.Converter;
 import org.springframework.http.MediaType;
 import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
@@ -33,16 +30,12 @@ import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
-import org.springframework.lang.NonNull;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
 import java.time.ZoneId;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -76,7 +69,7 @@ public class BeanConfig implements WebMvcConfigurer {
             converterList.remove(converterTarget);
         }
         HttpMessageConverter<?> converter = new StringHttpMessageConverter(StandardCharsets.UTF_8);
-        converterList.add(1,converter);
+        converterList.add(1, converter);
 
         MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter = new MappingJackson2HttpMessageConverter();
         mappingJackson2HttpMessageConverter.setSupportedMediaTypes(Arrays.asList(
@@ -182,7 +175,7 @@ public class BeanConfig implements WebMvcConfigurer {
     }
 
     //解决跨域方式二
-    static final String ORIGINS[] = new String[]{"GET", "POST", "PUT", "DELETE","OPTIONS"};
+    static final String ORIGINS[] = new String[]{"GET", "POST", "PUT", "DELETE", "OPTIONS"};
 
     @Override
     public void addCorsMappings(CorsRegistry registry) {
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/common/constant/BizConst.java b/kqapi/src/main/java/com/ningdatech/kqapi/common/constant/BizConst.java
index 7dc6a93..0307599 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/common/constant/BizConst.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/common/constant/BizConst.java
@@ -4,14 +4,17 @@ import com.ningdatech.kqapi.common.model.ApiResponse;
 
 /**
  * <p>
- * 业务常量
+ * BizConst
  * </p>
  *
  * @author WendyYang
- * @since 13:42 2022/12/1
+ * @since 11:46 2024/4/20
  */
 public class BizConst {
 
+    private BizConst() {
+    }
+
     /**
      * SQL查询一条
      */
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/common/handler/BaseFieldFillHandler.java b/kqapi/src/main/java/com/ningdatech/kqapi/common/handler/BaseFieldFillHandler.java
new file mode 100644
index 0000000..cf35c66
--- /dev/null
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/common/handler/BaseFieldFillHandler.java
@@ -0,0 +1,49 @@
+package com.ningdatech.kqapi.common.handler;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.ningdatech.kqapi.user.util.LoginUserUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+
+import static com.ningdatech.kqapi.common.constant.BaseFieldConst.*;
+
+
+/**
+ * <p>
+ * BaseFieldFillHandler
+ * </p>
+ *
+ * @author WendyYang
+ * @since 14:36 2024/4/20
+ */
+@Slf4j
+@Component
+public class BaseFieldFillHandler implements MetaObjectHandler {
+
+    private Long getUserId() {
+        if (LoginUserUtil.isLogin()) {
+            return LoginUserUtil.getUserId();
+        }
+        return 0L;
+    }
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        long userId = getUserId();
+        LocalDateTime now = LocalDateTime.now();
+        this.fillStrategy(metaObject, CREATE_BY, userId);
+        this.fillStrategy(metaObject, CREATE_ON, now);
+        this.fillStrategy(metaObject, UPDATE_BY, userId);
+        this.fillStrategy(metaObject, UPDATE_ON, now);
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        this.fillStrategy(metaObject, UPDATE_BY, getUserId());
+        this.fillStrategy(metaObject, UPDATE_ON, LocalDateTime.now());
+    }
+
+}
\ No newline at end of file
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/common/handler/GlobalExceptionHandler.java b/kqapi/src/main/java/com/ningdatech/kqapi/common/handler/GlobalExceptionHandler.java
index 2a331c6..3ff67e0 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/common/handler/GlobalExceptionHandler.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/common/handler/GlobalExceptionHandler.java
@@ -19,9 +19,12 @@ import javax.validation.ConstraintViolationException;
 import java.util.stream.Collectors;
 
 /**
- * @description: 统一错误处理
- * @author: liuxinxin
- * @date: 2023/01/03 11:39
+ * <p>
+ * GlobalExceptionHandler
+ * </p>
+ *
+ * @author WendyYang
+ * @since 15:16 2024/4/20
  */
 @Slf4j
 @ControllerAdvice
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/common/handler/GlobalResponseHandler.java b/kqapi/src/main/java/com/ningdatech/kqapi/common/handler/GlobalResponseHandler.java
index fbb2695..f6745b9 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/common/handler/GlobalResponseHandler.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/common/handler/GlobalResponseHandler.java
@@ -11,11 +11,17 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
 
 /**
- * @Author liuxinxin
- * @Date 2021/7/21 11:26
- * @Version 1.0
- **/
+ * <p>
+ * GlobalResponseHandler
+ * </p>
+ *
+ * @author WendyYang
+ * @since 15:16 2024/4/20
+ */
 @RestControllerAdvice(basePackages = {
+        "com.ningdatech.kqapi.admin.controller",
+        "com.ningdatech.kqapi.user.controller",
+        "com.ningdatech.kqapi.security.controller",
         "com.ningdatech.kqapi.zzsfw.controller",
         "com.ningdatech.kqapi.scheduler.controller"
 })
@@ -24,24 +30,18 @@ public class GlobalResponseHandler implements ResponseBodyAdvice<Object> {
     private static final String SWAGGER_CLASS_PREFIX = "springfox.documentation";
 
     @Override
-    public boolean supports(MethodParameter methodParameter, Class<? extends HttpMessageConverter<?>> aClass) {
+    public boolean supports(MethodParameter methodParameter,
+                            Class<? extends HttpMessageConverter<?>> aClass) {
         return filter(methodParameter);
     }
 
     @Override
-    public Object beforeBodyWrite(Object o, MethodParameter methodParameter, MediaType mediaType,
-                                  Class<? extends HttpMessageConverter<?>> aClass, ServerHttpRequest serverHttpRequest,
+    public Object beforeBodyWrite(Object o, MethodParameter methodParameter,
+                                  MediaType mediaType,
+                                  Class<? extends HttpMessageConverter<?>> aClass,
+                                  ServerHttpRequest serverHttpRequest,
                                   ServerHttpResponse serverHttpResponse) {
-        ApiResponse<Object> apiResponse = ApiResponse.ofSuccess(o);
-        // 处理字符串时，遇到了类型转换的问题，debug一步一步跟踪，原来是对于字符串的ContentType是“text-plain”，
-        // ConverterType是StringHttpMessageConverter这个类型转换，
-        // 由于将结果封装成了自定义的ApiResponse类型，所以有ApiResponse转换成String报错
-        // 所以需要对String类型的返回值单独进行处理
-//        if (o instanceof String) {
-//            return JSONUtil.toJsonStr(apiResponse);
-//        }
         return ApiResponse.ofSuccess(o);
-//        return o;
     }
 
     private Boolean filter(MethodParameter methodParameter) {
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/common/helper/MatterCacheHelper.java b/kqapi/src/main/java/com/ningdatech/kqapi/common/helper/MatterCacheHelper.java
index 307978a..257f74a 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/common/helper/MatterCacheHelper.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/common/helper/MatterCacheHelper.java
@@ -1,8 +1,7 @@
 package com.ningdatech.kqapi.common.helper;
 
 
-import com.ningdatech.kqapi.zzsfw.entity.entity.DscSxAdsShareItemQltQlsxCommonIDVKq;
-import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMattersDeduplicate;
+import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMattersDeduplicate;
 
 import java.util.List;
 
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/common/helper/basic/AbstractMatterCacheHelper.java b/kqapi/src/main/java/com/ningdatech/kqapi/common/helper/basic/AbstractMatterCacheHelper.java
index 9a52c94..ac7ed37 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/common/helper/basic/AbstractMatterCacheHelper.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/common/helper/basic/AbstractMatterCacheHelper.java
@@ -5,11 +5,11 @@ import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.google.common.collect.Lists;
 import com.ningdatech.kqapi.common.constant.BizConst;
-import com.ningdatech.kqapi.zzsfw.entity.entity.ComponentsMatterEliminateEntity;
+import com.ningdatech.kqapi.zzsfw.model.entity.ComponentsMatterEliminateEntity;
 import com.ningdatech.kqapi.zzsfw.service.ComponentsMatterEliminateService;
-import com.ningdatech.kqapi.zzsfw.entity.entity.DscSxAdsShareItemQltQlsxCommonIDVKq;
-import com.ningdatech.kqapi.zzsfw.entity.entity.MatterKey;
-import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMattersDeduplicate;
+import com.ningdatech.kqapi.zzsfw.model.entity.DscSxAdsShareItemQltQlsxCommonIDVKq;
+import com.ningdatech.kqapi.zzsfw.model.entity.MatterKey;
+import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMattersDeduplicate;
 import com.ningdatech.kqapi.zzsfw.service.IDscSxAdsShareItemQltQlsxCommonIDVKqService;
 import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMatterDeduplicateService;
 import lombok.extern.slf4j.Slf4j;
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/common/helper/impl/MattersCacheHelperImpl.java b/kqapi/src/main/java/com/ningdatech/kqapi/common/helper/impl/MattersCacheHelperImpl.java
index af3e623..309eee9 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/common/helper/impl/MattersCacheHelperImpl.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/common/helper/impl/MattersCacheHelperImpl.java
@@ -2,7 +2,7 @@ package com.ningdatech.kqapi.common.helper.impl;
 
 import com.ningdatech.kqapi.common.helper.MatterCacheHelper;
 import com.ningdatech.kqapi.common.helper.basic.AbstractMatterCacheHelper;
-import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMattersDeduplicate;
+import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMattersDeduplicate;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/common/util/SpringUtils.java b/kqapi/src/main/java/com/ningdatech/kqapi/common/util/SpringUtils.java
deleted file mode 100644
index 540560c..0000000
--- a/kqapi/src/main/java/com/ningdatech/kqapi/common/util/SpringUtils.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.ningdatech.kqapi.common.util;
-
-import org.springframework.context.ApplicationContext;
-import org.springframework.util.Assert;
-
-import java.util.Map;
-
-/**
- * Spring工具类
- *
- * @author WendyYang
- * @date 2017-12-25 16:27
- */
-public final class SpringUtils {
-    private SpringUtils() {
-    }
-
-    /**
-     * 单例Holder模式： 优点：将懒加载和线程安全完美结合的一种方式（无锁）。（推荐）
-     *
-     * @return 实实例
-     */
-    public static SpringUtils getInstance() {
-        return SpringUtilsHolder.INSTANCE;
-    }
-
-    private static ApplicationContext applicationContext;
-    private static ApplicationContext parentApplicationContext;
-
-    public static ApplicationContext getApplicationContext() {
-        return applicationContext;
-    }
-
-    public static void setApplicationContext(ApplicationContext ctx) {
-        Assert.notNull(ctx, "SpringUtil injection ApplicationContext is null");
-        applicationContext = ctx;
-        parentApplicationContext = ctx.getParent();
-    }
-
-    public static Object getBean(String name) {
-        Assert.hasText(name, "SpringUtil name is null or empty");
-        try {
-            return applicationContext.getBean(name);
-        } catch (Exception e) {
-            return parentApplicationContext.getBean(name);
-        }
-    }
-
-    public static <T> T getBean(String name, Class<T> type) {
-        Assert.hasText(name, "SpringUtil name is null or empty");
-        Assert.notNull(type, "SpringUtil type is null");
-        try {
-            return applicationContext.getBean(name, type);
-        } catch (Exception e) {
-            return parentApplicationContext.getBean(name, type);
-        }
-    }
-
-    public static <T> T getBean(Class<T> type) {
-        Assert.notNull(type, "SpringUtil type is null");
-        try {
-            return applicationContext.getBean(type);
-        } catch (Exception e) {
-            return parentApplicationContext.getBean(type);
-        }
-    }
-
-    public static <T> Map<String, T> getBeansOfType(Class<T> type) {
-        Assert.notNull(type, "SpringUtil type is null");
-        try {
-            return applicationContext.getBeansOfType(type);
-        } catch (Exception e) {
-            return parentApplicationContext.getBeansOfType(type);
-        }
-    }
-
-    public static ApplicationContext publishEvent(Object event) {
-        applicationContext.publishEvent(event);
-        return applicationContext;
-    }
-
-
-    /**
-     * <p>
-     * 类级的内部类，也就是静态的成员式内部类，该内部类的实例与外部类的实例
-     * 没有绑定关系，而且只有被调用到才会装载，从而实现了延迟加载
-     */
-    private static class SpringUtilsHolder {
-        /**
-         * 静态初始化器，由JVM来保证线程安全
-         */
-        private static final SpringUtils INSTANCE = new SpringUtils();
-    }
-
-}
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/manage/SynManage.java b/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/manage/SynManage.java
index 4fa1224..b6f6f94 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/manage/SynManage.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/manage/SynManage.java
@@ -1,14 +1,13 @@
 package com.ningdatech.kqapi.scheduler.manage;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
-import com.ningdatech.kqapi.zzsfw.entity.dto.NdKqZzsfwMattersDeduplicateDTO;
-import com.ningdatech.kqapi.zzsfw.entity.dto.NdKqZzsfwMenuDTO;
-import com.ningdatech.kqapi.zzsfw.entity.dto.NdKqZzsfwPolicyDTO;
-import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMattersDeduplicate;
-import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMenu;
-import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwPolicy;
+import com.ningdatech.kqapi.zzsfw.model.dto.NdKqZzsfwMattersDeduplicateDTO;
+import com.ningdatech.kqapi.zzsfw.model.dto.NdKqZzsfwMenuDTO;
+import com.ningdatech.kqapi.zzsfw.model.dto.NdKqZzsfwPolicyDTO;
+import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMattersDeduplicate;
+import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMenu;
+import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwPolicy;
 import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMatterDeduplicateService;
 import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMenuService;
 import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwPolicyService;
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/task/CheckMattersUrlTask.java b/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/task/CheckMattersUrlTask.java
index 676e8cb..27d5963 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/task/CheckMattersUrlTask.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/task/CheckMattersUrlTask.java
@@ -4,8 +4,7 @@ import cn.hutool.core.date.StopWatch;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.common.collect.Lists;
 import com.ningdatech.kqapi.common.model.entity.Item;
-import com.ningdatech.kqapi.common.util.HttpUtil;
-import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMenu;
+import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMenu;
 import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMenuService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -30,17 +29,11 @@ import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 
 import javax.net.ssl.SSLContext;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
 import java.net.*;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * @author ZPF
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/task/RemoveMattersTask.java b/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/task/RemoveMattersTask.java
index fd9a279..dbbc3a7 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/task/RemoveMattersTask.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/task/RemoveMattersTask.java
@@ -3,7 +3,7 @@ package com.ningdatech.kqapi.scheduler.task;
 import cn.hutool.core.date.StopWatch;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ningdatech.kqapi.scheduler.contants.TaskContant;
-import com.ningdatech.kqapi.zzsfw.entity.entity.DscSxAdsShareItemQltQlsxCommonIDVKq;
+import com.ningdatech.kqapi.zzsfw.model.entity.DscSxAdsShareItemQltQlsxCommonIDVKq;
 import com.ningdatech.kqapi.zzsfw.service.IDscSxAdsShareItemQltQlsxCommonIDVKqService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/task/SynTask.java b/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/task/SynTask.java
index 04ecebd..51e07e9 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/task/SynTask.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/task/SynTask.java
@@ -7,12 +7,12 @@ import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.ningdatech.kqapi.common.constant.BizConst;
 import com.ningdatech.kqapi.common.enumeration.CommonEnum;
 import com.ningdatech.kqapi.common.helper.MatterCacheHelper;
-import com.ningdatech.kqapi.zzsfw.entity.entity.ComponentsMatterEliminateEntity;
+import com.ningdatech.kqapi.zzsfw.model.entity.ComponentsMatterEliminateEntity;
 import com.ningdatech.kqapi.zzsfw.service.ComponentsMatterEliminateService;
-import com.ningdatech.kqapi.zzsfw.entity.entity.DscSxAdsShareItemQltQlsxCommonIDVKq;
-import com.ningdatech.kqapi.zzsfw.entity.entity.MatterKey;
-import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMattersDeduplicate;
-import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMenu;
+import com.ningdatech.kqapi.zzsfw.model.entity.DscSxAdsShareItemQltQlsxCommonIDVKq;
+import com.ningdatech.kqapi.zzsfw.model.entity.MatterKey;
+import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMattersDeduplicate;
+import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMenu;
 import com.ningdatech.kqapi.zzsfw.manage.MatterManage;
 import com.ningdatech.kqapi.zzsfw.service.IDscSxAdsShareItemQltQlsxCommonIDVKqService;
 import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMatterDeduplicateService;
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/DscSxAdsShareItemQltQlsxCommonIDVKqController.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/DscSxAdsShareItemQltQlsxCommonIDVKqController.java
index d3d13aa..e5bb0d8 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/DscSxAdsShareItemQltQlsxCommonIDVKqController.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/DscSxAdsShareItemQltQlsxCommonIDVKqController.java
@@ -1,7 +1,7 @@
 package com.ningdatech.kqapi.zzsfw.controller;
 
-import com.ningdatech.kqapi.zzsfw.entity.dto.DscSxAdsShareItemQltQlsxCommonIDVKqDTO;
-import com.ningdatech.kqapi.zzsfw.entity.entity.DscSxAdsShareItemQltQlsxCommonIDVKq;
+import com.ningdatech.kqapi.zzsfw.model.dto.DscSxAdsShareItemQltQlsxCommonIDVKqDTO;
+import com.ningdatech.kqapi.zzsfw.model.entity.DscSxAdsShareItemQltQlsxCommonIDVKq;
 import com.ningdatech.kqapi.zzsfw.manage.QlManage;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/NdKqZzsfwMenuController.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/NdKqZzsfwMenuController.java
index bdfe317..d353d3d 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/NdKqZzsfwMenuController.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/NdKqZzsfwMenuController.java
@@ -1,12 +1,11 @@
 package com.ningdatech.kqapi.zzsfw.controller;
 
-import cn.hutool.core.collection.CollUtil;
 import com.ningdatech.kqapi.common.exception.BizException;
-import com.ningdatech.kqapi.zzsfw.entity.dto.NdKqZzsfwMattersDeduplicateDTO;
-import com.ningdatech.kqapi.zzsfw.entity.dto.NdKqZzsfwMenuDTO;
-import com.ningdatech.kqapi.zzsfw.entity.vo.MatterTopVO;
-import com.ningdatech.kqapi.zzsfw.entity.vo.MattersVO;
-import com.ningdatech.kqapi.zzsfw.entity.vo.TreeVO;
+import com.ningdatech.kqapi.zzsfw.model.dto.NdKqZzsfwMattersDeduplicateDTO;
+import com.ningdatech.kqapi.zzsfw.model.dto.NdKqZzsfwMenuDTO;
+import com.ningdatech.kqapi.zzsfw.model.vo.MatterTopVO;
+import com.ningdatech.kqapi.zzsfw.model.vo.MattersVO;
+import com.ningdatech.kqapi.zzsfw.model.vo.TreeVO;
 import com.ningdatech.kqapi.zzsfw.manage.MatterManage;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/PolicyRegulationsController.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/PolicyRegulationsController.java
index 1bbc6cd..e79c46e 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/PolicyRegulationsController.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/PolicyRegulationsController.java
@@ -1,8 +1,8 @@
 package com.ningdatech.kqapi.zzsfw.controller;
 
 import com.ningdatech.kqapi.common.model.PageVo;
-import com.ningdatech.kqapi.zzsfw.entity.dto.NdKqZzsfwPolicyDTO;
-import com.ningdatech.kqapi.zzsfw.entity.vo.NdKqZzsfwPolicyVO;
+import com.ningdatech.kqapi.zzsfw.model.dto.NdKqZzsfwPolicyDTO;
+import com.ningdatech.kqapi.zzsfw.model.vo.NdKqZzsfwPolicyVO;
 import com.ningdatech.kqapi.zzsfw.manage.PolicyManage;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/MatterManage.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/MatterManage.java
index 2b08d7e..8976ef1 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/MatterManage.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/MatterManage.java
@@ -2,19 +2,16 @@ package com.ningdatech.kqapi.zzsfw.manage;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.StopWatch;
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ningdatech.kqapi.common.enumeration.CommonEnum;
-import com.ningdatech.kqapi.common.helper.MatterCacheHelper;
 import com.ningdatech.kqapi.zzsfw.constants.ZzsfwMenuConstant;
-import com.ningdatech.kqapi.zzsfw.entity.dto.NdKqZzsfwMattersDeduplicateDTO;
-import com.ningdatech.kqapi.zzsfw.entity.dto.NdKqZzsfwMenuDTO;
-import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMattersDeduplicate;
-import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMenu;
-import com.ningdatech.kqapi.zzsfw.entity.vo.MatterTopVO;
-import com.ningdatech.kqapi.zzsfw.entity.vo.MattersVO;
-import com.ningdatech.kqapi.zzsfw.entity.vo.TreeVO;
+import com.ningdatech.kqapi.zzsfw.model.dto.NdKqZzsfwMattersDeduplicateDTO;
+import com.ningdatech.kqapi.zzsfw.model.dto.NdKqZzsfwMenuDTO;
+import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMattersDeduplicate;
+import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMenu;
+import com.ningdatech.kqapi.zzsfw.model.vo.MatterTopVO;
+import com.ningdatech.kqapi.zzsfw.model.vo.MattersVO;
+import com.ningdatech.kqapi.zzsfw.model.vo.TreeVO;
 import com.ningdatech.kqapi.zzsfw.enumeration.ItemTypeEnum;
 import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMatterDeduplicateService;
 import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMenuService;
@@ -102,13 +99,12 @@ public class MatterManage {
                         (!m.getType().equals(ItemTypeEnum.GOV.getCode()) || Objects.nonNull(m.getWebapplyurl())))
                 .collect(Collectors.toList());
         Set<String> zoneSet = new HashSet<>();
-        List<TreeVO> res = finalMatters.stream().filter(m -> zoneSet.add(m.getZoneName())).map(m -> {
+        return finalMatters.stream().filter(m -> zoneSet.add(m.getZoneName())).map(m -> {
             TreeVO zone = new TreeVO();
             zone.setName(m.getZoneName());
             zone.setType(ZzsfwMenuConstant.MENU_TYPE_ZONE);
             return zone;
         }).collect(Collectors.toList());
-        return res;
     }
 
     public List<TreeVO> getWindows(String zoneName) {
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/PolicyManage.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/PolicyManage.java
index 4c23e8f..66f5804 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/PolicyManage.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/PolicyManage.java
@@ -5,9 +5,9 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ningdatech.kqapi.common.model.PageVo;
-import com.ningdatech.kqapi.zzsfw.entity.dto.NdKqZzsfwPolicyDTO;
-import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwPolicy;
-import com.ningdatech.kqapi.zzsfw.entity.vo.NdKqZzsfwPolicyVO;
+import com.ningdatech.kqapi.zzsfw.model.dto.NdKqZzsfwPolicyDTO;
+import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwPolicy;
+import com.ningdatech.kqapi.zzsfw.model.vo.NdKqZzsfwPolicyVO;
 import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwPolicyService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/QlManage.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/QlManage.java
index a18755f..d9bb2bd 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/QlManage.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/QlManage.java
@@ -1,27 +1,15 @@
 package com.ningdatech.kqapi.zzsfw.manage;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ningdatech.kqapi.zzsfw.constants.ZzsfwMenuConstant;
-import com.ningdatech.kqapi.zzsfw.entity.dto.DscSxAdsShareItemQltQlsxCommonIDVKqDTO;
-import com.ningdatech.kqapi.zzsfw.entity.dto.NdKqZzsfwMattersDeduplicateDTO;
-import com.ningdatech.kqapi.zzsfw.entity.dto.NdKqZzsfwMenuDTO;
-import com.ningdatech.kqapi.zzsfw.entity.entity.DscSxAdsShareItemQltQlsxCommonIDVKq;
-import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMattersDeduplicate;
-import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMenu;
-import com.ningdatech.kqapi.zzsfw.entity.vo.MatterTopVO;
-import com.ningdatech.kqapi.zzsfw.entity.vo.TreeVO;
+import com.ningdatech.kqapi.zzsfw.model.dto.DscSxAdsShareItemQltQlsxCommonIDVKqDTO;
+import com.ningdatech.kqapi.zzsfw.model.entity.DscSxAdsShareItemQltQlsxCommonIDVKq;
 import com.ningdatech.kqapi.zzsfw.service.IDscSxAdsShareItemQltQlsxCommonIDVKqService;
-import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMatterDeduplicateService;
-import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMenuService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @Classname MatterManage
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/ComponentsMatterEliminateMapper.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/ComponentsMatterEliminateMapper.java
index 33867b0..cd555c4 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/ComponentsMatterEliminateMapper.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/ComponentsMatterEliminateMapper.java
@@ -1,7 +1,7 @@
 package com.ningdatech.kqapi.zzsfw.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ningdatech.kqapi.zzsfw.entity.entity.ComponentsMatterEliminateEntity;
+import com.ningdatech.kqapi.zzsfw.model.entity.ComponentsMatterEliminateEntity;
 
 /**
  * @author wangrenkang
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/DscSxAdsShareItemQltQlsxCommonIDVKqMapper.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/DscSxAdsShareItemQltQlsxCommonIDVKqMapper.java
index 151931d..88b5f87 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/DscSxAdsShareItemQltQlsxCommonIDVKqMapper.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/DscSxAdsShareItemQltQlsxCommonIDVKqMapper.java
@@ -1,6 +1,6 @@
 package com.ningdatech.kqapi.zzsfw.mapper;
 
-import com.ningdatech.kqapi.zzsfw.entity.entity.DscSxAdsShareItemQltQlsxCommonIDVKq;
+import com.ningdatech.kqapi.zzsfw.model.entity.DscSxAdsShareItemQltQlsxCommonIDVKq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMatterDeduplicateMapper.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMatterDeduplicateMapper.java
index 292ddf9..63b3e1a 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMatterDeduplicateMapper.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMatterDeduplicateMapper.java
@@ -1,7 +1,7 @@
 package com.ningdatech.kqapi.zzsfw.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMattersDeduplicate;
+import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMattersDeduplicate;
 
 /**
  * <p>
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.java
index 89ce80e..7d4cad9 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.java
@@ -1,6 +1,6 @@
 package com.ningdatech.kqapi.zzsfw.mapper;
 
-import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMenu;
+import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMenu;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwPolicyMapper.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwPolicyMapper.java
index 7d26e08..6258a3b 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwPolicyMapper.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwPolicyMapper.java
@@ -1,8 +1,7 @@
 package com.ningdatech.kqapi.zzsfw.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMenu;
-import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwPolicy;
+import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwPolicy;
 
 /**
  * <p>
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/dto/DscSxAdsShareItemQltQlsxCommonIDVKqDTO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/DscSxAdsShareItemQltQlsxCommonIDVKqDTO.java
similarity index 99%
rename from kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/dto/DscSxAdsShareItemQltQlsxCommonIDVKqDTO.java
rename to kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/DscSxAdsShareItemQltQlsxCommonIDVKqDTO.java
index 301e34a..cbee986 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/dto/DscSxAdsShareItemQltQlsxCommonIDVKqDTO.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/DscSxAdsShareItemQltQlsxCommonIDVKqDTO.java
@@ -1,4 +1,4 @@
-package com.ningdatech.kqapi.zzsfw.entity.dto;
+package com.ningdatech.kqapi.zzsfw.model.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwMattersDeduplicateDTO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/NdKqZzsfwMattersDeduplicateDTO.java
similarity index 93%
rename from kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwMattersDeduplicateDTO.java
rename to kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/NdKqZzsfwMattersDeduplicateDTO.java
index 5523ebd..7930245 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwMattersDeduplicateDTO.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/NdKqZzsfwMattersDeduplicateDTO.java
@@ -1,4 +1,4 @@
-package com.ningdatech.kqapi.zzsfw.entity.dto;
+package com.ningdatech.kqapi.zzsfw.model.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwMenuDTO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/NdKqZzsfwMenuDTO.java
similarity index 95%
rename from kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwMenuDTO.java
rename to kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/NdKqZzsfwMenuDTO.java
index e3d537f..a51c19b 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwMenuDTO.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/NdKqZzsfwMenuDTO.java
@@ -1,4 +1,4 @@
-package com.ningdatech.kqapi.zzsfw.entity.dto;
+package com.ningdatech.kqapi.zzsfw.model.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwPolicyDTO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/NdKqZzsfwPolicyDTO.java
similarity index 96%
rename from kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwPolicyDTO.java
rename to kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/NdKqZzsfwPolicyDTO.java
index b9f794b..08a5f2a 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwPolicyDTO.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/NdKqZzsfwPolicyDTO.java
@@ -1,4 +1,4 @@
-package com.ningdatech.kqapi.zzsfw.entity.dto;
+package com.ningdatech.kqapi.zzsfw.model.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/ComponentsMatterEliminateEntity.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/ComponentsMatterEliminateEntity.java
similarity index 89%
rename from kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/ComponentsMatterEliminateEntity.java
rename to kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/ComponentsMatterEliminateEntity.java
index bfe883b..7d08674 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/ComponentsMatterEliminateEntity.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/ComponentsMatterEliminateEntity.java
@@ -1,9 +1,8 @@
-package com.ningdatech.kqapi.zzsfw.entity.entity;
+package com.ningdatech.kqapi.zzsfw.model.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/DscSxAdsShareItemQltQlsxCommonIDVKq.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/DscSxAdsShareItemQltQlsxCommonIDVKq.java
similarity index 99%
rename from kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/DscSxAdsShareItemQltQlsxCommonIDVKq.java
rename to kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/DscSxAdsShareItemQltQlsxCommonIDVKq.java
index dc7df47..2922b59 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/DscSxAdsShareItemQltQlsxCommonIDVKq.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/DscSxAdsShareItemQltQlsxCommonIDVKq.java
@@ -1,4 +1,4 @@
-package com.ningdatech.kqapi.zzsfw.entity.entity;
+package com.ningdatech.kqapi.zzsfw.model.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/MatterKey.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/MatterKey.java
similarity index 89%
rename from kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/MatterKey.java
rename to kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/MatterKey.java
index 1b477b2..357f80a 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/MatterKey.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/MatterKey.java
@@ -1,4 +1,4 @@
-package com.ningdatech.kqapi.zzsfw.entity.entity;
+package com.ningdatech.kqapi.zzsfw.model.entity;
 
 import lombok.Data;
 
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwMattersDeduplicate.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/NdKqZzsfwMattersDeduplicate.java
similarity index 96%
rename from kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwMattersDeduplicate.java
rename to kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/NdKqZzsfwMattersDeduplicate.java
index 6de3237..75e936e 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwMattersDeduplicate.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/NdKqZzsfwMattersDeduplicate.java
@@ -1,4 +1,4 @@
-package com.ningdatech.kqapi.zzsfw.entity.entity;
+package com.ningdatech.kqapi.zzsfw.model.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwMenu.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/NdKqZzsfwMenu.java
similarity index 93%
rename from kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwMenu.java
rename to kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/NdKqZzsfwMenu.java
index 90cb53c..4cff81c 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwMenu.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/NdKqZzsfwMenu.java
@@ -1,4 +1,4 @@
-package com.ningdatech.kqapi.zzsfw.entity.entity;
+package com.ningdatech.kqapi.zzsfw.model.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -19,7 +19,7 @@ import lombok.Data;
  */
 @Data
 @TableName("nd_kq_zzsfw_menu")
-@ApiModel(value = "NdKqZzsfwMenu对象", description = "")
+@ApiModel(value = "NdKqZzsfwMenu对象")
 public class NdKqZzsfwMenu implements Serializable {
 
     private static final long serialVersionUID = 1L;
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwPolicy.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/NdKqZzsfwPolicy.java
similarity index 96%
rename from kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwPolicy.java
rename to kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/NdKqZzsfwPolicy.java
index a46b3b0..aaa6b7e 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwPolicy.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/NdKqZzsfwPolicy.java
@@ -1,4 +1,4 @@
-package com.ningdatech.kqapi.zzsfw.entity.entity;
+package com.ningdatech.kqapi.zzsfw.model.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/MatterTopVO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/MatterTopVO.java
similarity index 92%
rename from kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/MatterTopVO.java
rename to kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/MatterTopVO.java
index 791602c..b478a62 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/MatterTopVO.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/MatterTopVO.java
@@ -1,4 +1,4 @@
-package com.ningdatech.kqapi.zzsfw.entity.vo;
+package com.ningdatech.kqapi.zzsfw.model.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/MattersVO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/MattersVO.java
similarity index 95%
rename from kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/MattersVO.java
rename to kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/MattersVO.java
index 30a965e..24b4d13 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/MattersVO.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/MattersVO.java
@@ -1,4 +1,4 @@
-package com.ningdatech.kqapi.zzsfw.entity.vo;
+package com.ningdatech.kqapi.zzsfw.model.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/NdKqZzsfwPolicyVO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/NdKqZzsfwPolicyVO.java
similarity index 96%
rename from kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/NdKqZzsfwPolicyVO.java
rename to kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/NdKqZzsfwPolicyVO.java
index 87d73f7..b3d996d 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/NdKqZzsfwPolicyVO.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/NdKqZzsfwPolicyVO.java
@@ -1,4 +1,4 @@
-package com.ningdatech.kqapi.zzsfw.entity.vo;
+package com.ningdatech.kqapi.zzsfw.model.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/TreeVO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/TreeVO.java
similarity index 96%
rename from kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/TreeVO.java
rename to kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/TreeVO.java
index acf1a43..18b020f 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/TreeVO.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/TreeVO.java
@@ -1,4 +1,4 @@
-package com.ningdatech.kqapi.zzsfw.entity.vo;
+package com.ningdatech.kqapi.zzsfw.model.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/WindowVO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/WindowVO.java
similarity index 92%
rename from kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/WindowVO.java
rename to kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/WindowVO.java
index d932609..f982b95 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/WindowVO.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/WindowVO.java
@@ -1,4 +1,4 @@
-package com.ningdatech.kqapi.zzsfw.entity.vo;
+package com.ningdatech.kqapi.zzsfw.model.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/ZoneVO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/ZoneVO.java
similarity index 92%
rename from kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/ZoneVO.java
rename to kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/ZoneVO.java
index 0a0a05f..2b71c76 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/ZoneVO.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/ZoneVO.java
@@ -1,4 +1,4 @@
-package com.ningdatech.kqapi.zzsfw.entity.vo;
+package com.ningdatech.kqapi.zzsfw.model.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/ComponentsMatterEliminateService.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/ComponentsMatterEliminateService.java
index b12b063..3129522 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/ComponentsMatterEliminateService.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/ComponentsMatterEliminateService.java
@@ -1,7 +1,7 @@
 package com.ningdatech.kqapi.zzsfw.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ningdatech.kqapi.zzsfw.entity.entity.ComponentsMatterEliminateEntity;
+import com.ningdatech.kqapi.zzsfw.model.entity.ComponentsMatterEliminateEntity;
 
 // ComponentsMatterEliminateService.java
 public interface ComponentsMatterEliminateService extends IService<ComponentsMatterEliminateEntity> {
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/IDscSxAdsShareItemQltQlsxCommonIDVKqService.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/IDscSxAdsShareItemQltQlsxCommonIDVKqService.java
index 6dd2eab..be4be3b 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/IDscSxAdsShareItemQltQlsxCommonIDVKqService.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/IDscSxAdsShareItemQltQlsxCommonIDVKqService.java
@@ -1,6 +1,6 @@
 package com.ningdatech.kqapi.zzsfw.service;
 
-import com.ningdatech.kqapi.zzsfw.entity.entity.DscSxAdsShareItemQltQlsxCommonIDVKq;
+import com.ningdatech.kqapi.zzsfw.model.entity.DscSxAdsShareItemQltQlsxCommonIDVKq;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMatterDeduplicateService.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMatterDeduplicateService.java
index f94a816..8b25f63 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMatterDeduplicateService.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMatterDeduplicateService.java
@@ -1,7 +1,7 @@
 package com.ningdatech.kqapi.zzsfw.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMattersDeduplicate;
+import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMattersDeduplicate;
 
 /**
  * <p>
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMenuService.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMenuService.java
index af7b60a..9baaa96 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMenuService.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMenuService.java
@@ -1,6 +1,6 @@
 package com.ningdatech.kqapi.zzsfw.service;
 
-import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMenu;
+import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMenu;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwPolicyService.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwPolicyService.java
index 981b53d..8acc426 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwPolicyService.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwPolicyService.java
@@ -1,7 +1,7 @@
 package com.ningdatech.kqapi.zzsfw.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwPolicy;
+import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwPolicy;
 
 /**
  * <p>
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/ComponentsMatterEliminateServiceImpl.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/ComponentsMatterEliminateServiceImpl.java
index 0e4871c..7042acd 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/ComponentsMatterEliminateServiceImpl.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/ComponentsMatterEliminateServiceImpl.java
@@ -1,7 +1,7 @@
 package com.ningdatech.kqapi.zzsfw.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ningdatech.kqapi.zzsfw.entity.entity.ComponentsMatterEliminateEntity;
+import com.ningdatech.kqapi.zzsfw.model.entity.ComponentsMatterEliminateEntity;
 import com.ningdatech.kqapi.zzsfw.mapper.ComponentsMatterEliminateMapper;
 import com.ningdatech.kqapi.zzsfw.service.ComponentsMatterEliminateService;
 import org.springframework.stereotype.Service;
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/DscSxAdsShareItemQltQlsxCommonIDVKqServiceImpl.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/DscSxAdsShareItemQltQlsxCommonIDVKqServiceImpl.java
index 8c60874..8af12b7 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/DscSxAdsShareItemQltQlsxCommonIDVKqServiceImpl.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/DscSxAdsShareItemQltQlsxCommonIDVKqServiceImpl.java
@@ -1,6 +1,6 @@
 package com.ningdatech.kqapi.zzsfw.service.impl;
 
-import com.ningdatech.kqapi.zzsfw.entity.entity.DscSxAdsShareItemQltQlsxCommonIDVKq;
+import com.ningdatech.kqapi.zzsfw.model.entity.DscSxAdsShareItemQltQlsxCommonIDVKq;
 import com.ningdatech.kqapi.zzsfw.mapper.DscSxAdsShareItemQltQlsxCommonIDVKqMapper;
 import com.ningdatech.kqapi.zzsfw.service.IDscSxAdsShareItemQltQlsxCommonIDVKqService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMatterDeduplicateServiceImpl.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMatterDeduplicateServiceImpl.java
index 0f04f0f..e37217a 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMatterDeduplicateServiceImpl.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMatterDeduplicateServiceImpl.java
@@ -1,7 +1,7 @@
 package com.ningdatech.kqapi.zzsfw.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMattersDeduplicate;
+import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMattersDeduplicate;
 import com.ningdatech.kqapi.zzsfw.mapper.NdKqZzsfwMatterDeduplicateMapper;
 import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMatterDeduplicateService;
 import org.springframework.stereotype.Service;
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMenuServiceImpl.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMenuServiceImpl.java
index db100d2..d8d36cf 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMenuServiceImpl.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMenuServiceImpl.java
@@ -1,6 +1,6 @@
 package com.ningdatech.kqapi.zzsfw.service.impl;
 
-import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMenu;
+import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMenu;
 import com.ningdatech.kqapi.zzsfw.mapper.NdKqZzsfwMenuMapper;
 import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMenuService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwPolicyServiceImpl.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwPolicyServiceImpl.java
index 5a565b4..6e3aa78 100644
--- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwPolicyServiceImpl.java
+++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwPolicyServiceImpl.java
@@ -1,7 +1,7 @@
 package com.ningdatech.kqapi.zzsfw.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwPolicy;
+import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwPolicy;
 import com.ningdatech.kqapi.zzsfw.mapper.NdKqZzsfwPolicyMapper;
 import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwPolicyService;
 import org.springframework.stereotype.Service;
diff --git a/kqapi/src/main/resources/application-dev.yml b/kqapi/src/main/resources/application-dev.yml
index 307f02f..46f263e 100644
--- a/kqapi/src/main/resources/application-dev.yml
+++ b/kqapi/src/main/resources/application-dev.yml
@@ -76,6 +76,7 @@ mybatis-plus:
     db-config:
       logic-delete-value: true
       logic-not-delete-value: false
+      logic-delete-field: deleted
 logging:
   config: classpath:logback-spring.xml
   #日志配置
diff --git a/kqapi/src/main/resources/application-prod.yml b/kqapi/src/main/resources/application-prod.yml
index 16b94cf..786db38 100644
--- a/kqapi/src/main/resources/application-prod.yml
+++ b/kqapi/src/main/resources/application-prod.yml
@@ -77,6 +77,7 @@ mybatis-plus:
     db-config:
       logic-delete-value: true
       logic-not-delete-value: false
+      logic-delete-field: deleted
 logging:
   config: classpath:logback-spring.xml
   #日志配置
diff --git a/kqapi/src/test/java/com/ningdatech/kqapi/menu/DuplicationTest.java b/kqapi/src/test/java/com/ningdatech/kqapi/menu/DuplicationTest.java
index 6b6a372..871c33f 100644
--- a/kqapi/src/test/java/com/ningdatech/kqapi/menu/DuplicationTest.java
+++ b/kqapi/src/test/java/com/ningdatech/kqapi/menu/DuplicationTest.java
@@ -3,8 +3,8 @@ package com.ningdatech.kqapi.menu;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.common.collect.Sets;
 import com.ningdatech.kqapi.AppTests;
-import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMattersDeduplicate;
-import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMenu;
+import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMattersDeduplicate;
+import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMenu;
 import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMatterDeduplicateService;
 import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMenuService;
 import org.apache.commons.lang3.StringUtils;
diff --git a/kqapi/src/test/java/com/ningdatech/kqapi/menu/MenuTest.java b/kqapi/src/test/java/com/ningdatech/kqapi/menu/MenuTest.java
index 61c8abb..44d4249 100644
--- a/kqapi/src/test/java/com/ningdatech/kqapi/menu/MenuTest.java
+++ b/kqapi/src/test/java/com/ningdatech/kqapi/menu/MenuTest.java
@@ -2,10 +2,8 @@ package com.ningdatech.kqapi.menu;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ningdatech.kqapi.AppTests;
-import com.ningdatech.kqapi.zzsfw.entity.entity.DscSxAdsShareItemQltQlsxCommonIDVKq;
-import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMenu;
+import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMenu;
 import com.ningdatech.kqapi.zzsfw.enumeration.ItemTypeEnum;
-import com.ningdatech.kqapi.zzsfw.service.IDscSxAdsShareItemQltQlsxCommonIDVKqService;
 import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMenuService;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -19,7 +17,6 @@ import java.sql.DriverManager;
 import java.sql.Statement;
 import java.text.DecimalFormat;
 import java.time.LocalDateTime;
-import java.util.Objects;
 
 /**
  * @Classname MenuTest
diff --git a/kqapi/src/test/java/com/ningdatech/kqapi/menu/PolicyTest.java b/kqapi/src/test/java/com/ningdatech/kqapi/menu/PolicyTest.java
index bf3300f..110f295 100644
--- a/kqapi/src/test/java/com/ningdatech/kqapi/menu/PolicyTest.java
+++ b/kqapi/src/test/java/com/ningdatech/kqapi/menu/PolicyTest.java
@@ -3,11 +3,7 @@ package com.ningdatech.kqapi.menu;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ningdatech.kqapi.AppTests;
-import com.ningdatech.kqapi.zzsfw.entity.entity.DscSxAdsShareItemQltQlsxCommonIDVKq;
-import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMenu;
-import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwPolicy;
-import com.ningdatech.kqapi.zzsfw.service.IDscSxAdsShareItemQltQlsxCommonIDVKqService;
-import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMenuService;
+import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwPolicy;
 import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwPolicyService;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
diff --git a/kqapi/target/classes/BOOT-INF/classes/application-dev.yml b/kqapi/target/classes/BOOT-INF/classes/application-dev.yml
index 307f02f..46f263e 100644
--- a/kqapi/target/classes/BOOT-INF/classes/application-dev.yml
+++ b/kqapi/target/classes/BOOT-INF/classes/application-dev.yml
@@ -76,6 +76,7 @@ mybatis-plus:
     db-config:
       logic-delete-value: true
       logic-not-delete-value: false
+      logic-delete-field: deleted
 logging:
   config: classpath:logback-spring.xml
   #日志配置
diff --git a/kqapi/target/classes/BOOT-INF/classes/application-prod.yml b/kqapi/target/classes/BOOT-INF/classes/application-prod.yml
index 16b94cf..786db38 100644
--- a/kqapi/target/classes/BOOT-INF/classes/application-prod.yml
+++ b/kqapi/target/classes/BOOT-INF/classes/application-prod.yml
@@ -77,6 +77,7 @@ mybatis-plus:
     db-config:
       logic-delete-value: true
       logic-not-delete-value: false
+      logic-delete-field: deleted
 logging:
   config: classpath:logback-spring.xml
   #日志配置
diff --git a/kqapi/target/classes/application-dev.yml b/kqapi/target/classes/application-dev.yml
index 307f02f..46f263e 100644
--- a/kqapi/target/classes/application-dev.yml
+++ b/kqapi/target/classes/application-dev.yml
@@ -76,6 +76,7 @@ mybatis-plus:
     db-config:
       logic-delete-value: true
       logic-not-delete-value: false
+      logic-delete-field: deleted
 logging:
   config: classpath:logback-spring.xml
   #日志配置
diff --git a/kqapi/target/classes/application-prod.yml b/kqapi/target/classes/application-prod.yml
index 16b94cf..786db38 100644
--- a/kqapi/target/classes/application-prod.yml
+++ b/kqapi/target/classes/application-prod.yml
@@ -77,6 +77,7 @@ mybatis-plus:
     db-config:
       logic-delete-value: true
       logic-not-delete-value: false
+      logic-delete-field: deleted
 logging:
   config: classpath:logback-spring.xml
   #日志配置
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/App.class b/kqapi/target/classes/com/ningdatech/kqapi/App.class
index cab73f1..872109e 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/App.class and b/kqapi/target/classes/com/ningdatech/kqapi/App.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/common/config/BeanConfig.class b/kqapi/target/classes/com/ningdatech/kqapi/common/config/BeanConfig.class
index aefe417..3384d6c 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/common/config/BeanConfig.class and b/kqapi/target/classes/com/ningdatech/kqapi/common/config/BeanConfig.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/common/constant/BizConst.class b/kqapi/target/classes/com/ningdatech/kqapi/common/constant/BizConst.class
index 2c9be19..9692cad 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/common/constant/BizConst.class and b/kqapi/target/classes/com/ningdatech/kqapi/common/constant/BizConst.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/common/handler/GlobalExceptionHandler.class b/kqapi/target/classes/com/ningdatech/kqapi/common/handler/GlobalExceptionHandler.class
index eb0937c..118269a 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/common/handler/GlobalExceptionHandler.class and b/kqapi/target/classes/com/ningdatech/kqapi/common/handler/GlobalExceptionHandler.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/common/handler/GlobalResponseHandler.class b/kqapi/target/classes/com/ningdatech/kqapi/common/handler/GlobalResponseHandler.class
index 49e53f8..ff0c925 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/common/handler/GlobalResponseHandler.class and b/kqapi/target/classes/com/ningdatech/kqapi/common/handler/GlobalResponseHandler.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/common/helper/MatterCacheHelper.class b/kqapi/target/classes/com/ningdatech/kqapi/common/helper/MatterCacheHelper.class
index ab321ca..a36ed25 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/common/helper/MatterCacheHelper.class and b/kqapi/target/classes/com/ningdatech/kqapi/common/helper/MatterCacheHelper.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/common/helper/basic/AbstractMatterCacheHelper.class b/kqapi/target/classes/com/ningdatech/kqapi/common/helper/basic/AbstractMatterCacheHelper.class
index 01f2178..3ae6567 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/common/helper/basic/AbstractMatterCacheHelper.class and b/kqapi/target/classes/com/ningdatech/kqapi/common/helper/basic/AbstractMatterCacheHelper.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/common/helper/impl/MattersCacheHelperImpl.class b/kqapi/target/classes/com/ningdatech/kqapi/common/helper/impl/MattersCacheHelperImpl.class
index 2a49f44..09ea893 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/common/helper/impl/MattersCacheHelperImpl.class and b/kqapi/target/classes/com/ningdatech/kqapi/common/helper/impl/MattersCacheHelperImpl.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/common/util/HmacAuthUtil.class b/kqapi/target/classes/com/ningdatech/kqapi/common/util/HmacAuthUtil.class
deleted file mode 100644
index 0bf274f..0000000
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/common/util/HmacAuthUtil.class and /dev/null differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/common/util/SpringUtils$1.class b/kqapi/target/classes/com/ningdatech/kqapi/common/util/SpringUtils$1.class
deleted file mode 100644
index 33a1913..0000000
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/common/util/SpringUtils$1.class and /dev/null differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/common/util/SpringUtils$SpringUtilsHolder.class b/kqapi/target/classes/com/ningdatech/kqapi/common/util/SpringUtils$SpringUtilsHolder.class
deleted file mode 100644
index 477bf58..0000000
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/common/util/SpringUtils$SpringUtilsHolder.class and /dev/null differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/common/util/SpringUtils.class b/kqapi/target/classes/com/ningdatech/kqapi/common/util/SpringUtils.class
deleted file mode 100644
index 845b6fa..0000000
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/common/util/SpringUtils.class and /dev/null differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/scheduler/manage/SynManage.class b/kqapi/target/classes/com/ningdatech/kqapi/scheduler/manage/SynManage.class
index e18232d..aa52105 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/scheduler/manage/SynManage.class and b/kqapi/target/classes/com/ningdatech/kqapi/scheduler/manage/SynManage.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/scheduler/task/CheckMattersUrlTask.class b/kqapi/target/classes/com/ningdatech/kqapi/scheduler/task/CheckMattersUrlTask.class
index 775b370..e1ad456 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/scheduler/task/CheckMattersUrlTask.class and b/kqapi/target/classes/com/ningdatech/kqapi/scheduler/task/CheckMattersUrlTask.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/scheduler/task/RemoveMattersTask.class b/kqapi/target/classes/com/ningdatech/kqapi/scheduler/task/RemoveMattersTask.class
index 2013788..49b3b21 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/scheduler/task/RemoveMattersTask.class and b/kqapi/target/classes/com/ningdatech/kqapi/scheduler/task/RemoveMattersTask.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/scheduler/task/SynTask.class b/kqapi/target/classes/com/ningdatech/kqapi/scheduler/task/SynTask.class
index 34c9504..1d20c89 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/scheduler/task/SynTask.class and b/kqapi/target/classes/com/ningdatech/kqapi/scheduler/task/SynTask.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/sso/utils/HmacAuthUtil.class b/kqapi/target/classes/com/ningdatech/kqapi/sso/utils/HmacAuthUtil.class
index 2436833..193ab60 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/sso/utils/HmacAuthUtil.class and b/kqapi/target/classes/com/ningdatech/kqapi/sso/utils/HmacAuthUtil.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/constants/ZzsfwMenuConstant.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/constants/ZzsfwMenuConstant.class
index 1c8f72c..c81dc03 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/constants/ZzsfwMenuConstant.class and b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/constants/ZzsfwMenuConstant.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/controller/DscSxAdsShareItemQltQlsxCommonIDVKqController.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/controller/DscSxAdsShareItemQltQlsxCommonIDVKqController.class
index 4a27fc2..596d85d 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/controller/DscSxAdsShareItemQltQlsxCommonIDVKqController.class and b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/controller/DscSxAdsShareItemQltQlsxCommonIDVKqController.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/controller/NdKqZzsfwMenuController.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/controller/NdKqZzsfwMenuController.class
index 9727ec0..40b8f6d 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/controller/NdKqZzsfwMenuController.class and b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/controller/NdKqZzsfwMenuController.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/controller/PolicyRegulationsController.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/controller/PolicyRegulationsController.class
index 08c005a..3e6f934 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/controller/PolicyRegulationsController.class and b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/controller/PolicyRegulationsController.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/dto/DscSxAdsShareItemQltQlsxCommonIDVKqDTO.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/dto/DscSxAdsShareItemQltQlsxCommonIDVKqDTO.class
deleted file mode 100644
index 93a2901..0000000
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/dto/DscSxAdsShareItemQltQlsxCommonIDVKqDTO.class and /dev/null differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwMattersDeduplicateDTO.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwMattersDeduplicateDTO.class
deleted file mode 100644
index c385a1e..0000000
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwMattersDeduplicateDTO.class and /dev/null differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwMenuDTO.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwMenuDTO.class
deleted file mode 100644
index 1909d36..0000000
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwMenuDTO.class and /dev/null differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwPolicyDTO.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwPolicyDTO.class
deleted file mode 100644
index d3d7189..0000000
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwPolicyDTO.class and /dev/null differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/ComponentsMatterEliminateEntity.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/ComponentsMatterEliminateEntity.class
deleted file mode 100644
index 97e22e4..0000000
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/ComponentsMatterEliminateEntity.class and /dev/null differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/DscSxAdsShareItemQltQlsxCommonIDVKq.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/DscSxAdsShareItemQltQlsxCommonIDVKq.class
deleted file mode 100644
index 906ffb4..0000000
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/DscSxAdsShareItemQltQlsxCommonIDVKq.class and /dev/null differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/MatterKey.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/MatterKey.class
deleted file mode 100644
index 9282dd7..0000000
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/MatterKey.class and /dev/null differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwMattersDeduplicate.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwMattersDeduplicate.class
deleted file mode 100644
index c1e94a6..0000000
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwMattersDeduplicate.class and /dev/null differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwMenu.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwMenu.class
deleted file mode 100644
index 2030708..0000000
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwMenu.class and /dev/null differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwPolicy.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwPolicy.class
deleted file mode 100644
index 5be3334..0000000
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwPolicy.class and /dev/null differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/MatterTopVO.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/MatterTopVO.class
deleted file mode 100644
index be41496..0000000
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/MatterTopVO.class and /dev/null differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/MattersVO.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/MattersVO.class
deleted file mode 100644
index 11525be..0000000
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/MattersVO.class and /dev/null differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/NdKqZzsfwPolicyVO.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/NdKqZzsfwPolicyVO.class
deleted file mode 100644
index c1e5d95..0000000
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/NdKqZzsfwPolicyVO.class and /dev/null differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/TreeVO.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/TreeVO.class
deleted file mode 100644
index ccf376d..0000000
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/TreeVO.class and /dev/null differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/WindowVO.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/WindowVO.class
deleted file mode 100644
index fa6bf39..0000000
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/WindowVO.class and /dev/null differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/ZoneVO.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/ZoneVO.class
deleted file mode 100644
index e6bff75..0000000
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/ZoneVO.class and /dev/null differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/manage/MatterManage.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/manage/MatterManage.class
index cd1142e..e7dabf9 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/manage/MatterManage.class and b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/manage/MatterManage.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/manage/PolicyManage.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/manage/PolicyManage.class
index 5ce5195..18ddc6d 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/manage/PolicyManage.class and b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/manage/PolicyManage.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/manage/QlManage.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/manage/QlManage.class
index fad4bc6..c2d90dd 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/manage/QlManage.class and b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/manage/QlManage.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/ComponentsMatterEliminateMapper.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/ComponentsMatterEliminateMapper.class
index 48c7229..7da3e18 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/ComponentsMatterEliminateMapper.class and b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/ComponentsMatterEliminateMapper.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/DscSxAdsShareItemQltQlsxCommonIDVKqMapper.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/DscSxAdsShareItemQltQlsxCommonIDVKqMapper.class
index 538cc7a..45d22e6 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/DscSxAdsShareItemQltQlsxCommonIDVKqMapper.class and b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/DscSxAdsShareItemQltQlsxCommonIDVKqMapper.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMatterDeduplicateMapper.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMatterDeduplicateMapper.class
index c3265d5..e9db810 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMatterDeduplicateMapper.class and b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMatterDeduplicateMapper.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.class
index e9a58c6..7c719c8 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.class and b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwPolicyMapper.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwPolicyMapper.class
index 50f194f..5907de0 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwPolicyMapper.class and b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwPolicyMapper.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/ComponentsMatterEliminateService.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/ComponentsMatterEliminateService.class
index a74e731..df59ed4 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/ComponentsMatterEliminateService.class and b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/ComponentsMatterEliminateService.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/IDscSxAdsShareItemQltQlsxCommonIDVKqService.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/IDscSxAdsShareItemQltQlsxCommonIDVKqService.class
index b5ed5a2..d94d023 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/IDscSxAdsShareItemQltQlsxCommonIDVKqService.class and b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/IDscSxAdsShareItemQltQlsxCommonIDVKqService.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMatterDeduplicateService.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMatterDeduplicateService.class
index 2447d38..9661a06 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMatterDeduplicateService.class and b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMatterDeduplicateService.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMenuService.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMenuService.class
index 7ca3dfd..a625385 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMenuService.class and b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMenuService.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwPolicyService.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwPolicyService.class
index 1e94d41..4e6ef9c 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwPolicyService.class and b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwPolicyService.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/impl/ComponentsMatterEliminateServiceImpl.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/impl/ComponentsMatterEliminateServiceImpl.class
index 86b9b30..a5fe65d 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/impl/ComponentsMatterEliminateServiceImpl.class and b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/impl/ComponentsMatterEliminateServiceImpl.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/impl/DscSxAdsShareItemQltQlsxCommonIDVKqServiceImpl.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/impl/DscSxAdsShareItemQltQlsxCommonIDVKqServiceImpl.class
index 7ce0e81..1f10f7a 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/impl/DscSxAdsShareItemQltQlsxCommonIDVKqServiceImpl.class and b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/impl/DscSxAdsShareItemQltQlsxCommonIDVKqServiceImpl.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMatterDeduplicateServiceImpl.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMatterDeduplicateServiceImpl.class
index cb8d8d4..5ae5a2e 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMatterDeduplicateServiceImpl.class and b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMatterDeduplicateServiceImpl.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMenuServiceImpl.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMenuServiceImpl.class
index 07baed6..09ffda5 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMenuServiceImpl.class and b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMenuServiceImpl.class differ
diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwPolicyServiceImpl.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwPolicyServiceImpl.class
index 604c2da..bdd641b 100644
Binary files a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwPolicyServiceImpl.class and b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwPolicyServiceImpl.class differ
diff --git a/kqapi/target/test-classes/com/ningdatech/kqapi/menu/DuplicationTest.class b/kqapi/target/test-classes/com/ningdatech/kqapi/menu/DuplicationTest.class
index 6b5b0cd..a666823 100644
Binary files a/kqapi/target/test-classes/com/ningdatech/kqapi/menu/DuplicationTest.class and b/kqapi/target/test-classes/com/ningdatech/kqapi/menu/DuplicationTest.class differ
diff --git a/kqapi/target/test-classes/com/ningdatech/kqapi/menu/MenuTest.class b/kqapi/target/test-classes/com/ningdatech/kqapi/menu/MenuTest.class
index d54bc37..72557f0 100644
Binary files a/kqapi/target/test-classes/com/ningdatech/kqapi/menu/MenuTest.class and b/kqapi/target/test-classes/com/ningdatech/kqapi/menu/MenuTest.class differ
diff --git a/kqapi/target/test-classes/com/ningdatech/kqapi/menu/PolicyTest.class b/kqapi/target/test-classes/com/ningdatech/kqapi/menu/PolicyTest.class
index e5d4b6c..02d943b 100644
Binary files a/kqapi/target/test-classes/com/ningdatech/kqapi/menu/PolicyTest.class and b/kqapi/target/test-classes/com/ningdatech/kqapi/menu/PolicyTest.class differ
diff --git a/ningda-generator/src/main/java/com/ningdatech/generator/config/GeneratorCodeKingbaseConfig.java b/ningda-generator/src/main/java/com/ningdatech/generator/config/CodeGen.java
similarity index 86%
rename from ningda-generator/src/main/java/com/ningdatech/generator/config/GeneratorCodeKingbaseConfig.java
rename to ningda-generator/src/main/java/com/ningdatech/generator/config/CodeGen.java
index 3d64278..9217cd5 100644
--- a/ningda-generator/src/main/java/com/ningdatech/generator/config/GeneratorCodeKingbaseConfig.java
+++ b/ningda-generator/src/main/java/com/ningdatech/generator/config/CodeGen.java
@@ -11,10 +11,10 @@ import java.util.Collections;
  * @author: zpf
  * @date: 2023/01/03 09:20
  */
-public class GeneratorCodeKingbaseConfig {
+public class CodeGen {
 
     private static final String PATH_LXX = "/Users/liuxinxin/IdeaProjects/project-management/pmapi/src/main/java";
-    private static final String PATH_YYD = "/Users/wendy/code project/java/project-management/pmapi/src/main/java";
+    private static final String PATH_YYD = "/Users/wendy/coding/java/kq-value-added-project/kqapi/src/main/java";
     private static final String PATH_LS = "";
     private static final String PATH_ZPF = "D:\\ningda\\kq-value-added-project\\kqapi\\src\\main\\java";
     private static final String PATH_CMM = "D:\\work\\project-management\\project-management\\pmapi\\src\\main\\java";
@@ -46,7 +46,7 @@ public class GeneratorCodeKingbaseConfig {
                                     path + "/com/ningdatech/kqapi/" + packageName + "/mapper"));
                 })
                 .strategyConfig(builder -> {
-                    builder.addTablePrefix("");
+                    builder.addTablePrefix("nd");
                     // 设置需要生成的表名
                     builder.addInclude(tableNames);
                 })
@@ -56,8 +56,9 @@ public class GeneratorCodeKingbaseConfig {
     }
 
     public static void main(String[] args) {
-        //generate("Liuxinxin", "expert", PATH_LXX, "expert_gov_business_strip");
-        generate("ZPF", "zzsfw", PATH_ZPF, "nd_kq_zzsfw_menu");
+        // generate("Liuxinxin", "expert", PATH_LXX, "expert_gov_business_strip");
+        // generate("ZPF", "zzsfw", PATH_ZPF, "nd_kq_zzsfw_menu");
+        generate("WendyYang", "admin", PATH_YYD, "nd_window","nd_zone");
     }
 
 }