移动实体类到对应模块下

79ca31ac · 袁伟铭 · 451ee8e1 · 79ca31ac · 79ca31ac · 79ca31ac
Commit 79ca31ac authored Dec 03, 2021 by 袁伟铭
50 changed files
--- a/api-server/src/main/java/com/zq/api/config/ConfigCache.java
+++ b/api-server/src/main/java/com/zq/api/config/ConfigCache.java
@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zq.api.cache.Cache;
 import com.zq.api.cache.CacheManager;
 import com.zq.api.dao.SysConfigDao;
+import com.zq.api.entity.SysConfig;
 import com.zq.api.utils.NumberUtils;
 import com.zq.common.config.base.SpringContextHolder;
-import com.zq.common.entity.SysConfig;
 import lombok.extern.slf4j.Slf4j;
 import java.util.HashMap;

--- a/api-server/src/main/java/com/zq/api/dao/ApiLogDao.java
+++ b/api-server/src/main/java/com/zq/api/dao/ApiLogDao.java
 package com.zq.api.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zq.common.entity.ApiLog;
+import com.zq.api.entity.ApiLog;
 import org.springframework.stereotype.Repository;
 /**

--- a/api-server/src/main/java/com/zq/api/dao/SysConfigDao.java
+++ b/api-server/src/main/java/com/zq/api/dao/SysConfigDao.java
 package com.zq.api.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zq.common.entity.SysConfig;
+import com.zq.api.entity.SysConfig;
 import org.springframework.stereotype.Repository;
 /**

--- a/civil-common-utils/src/main/java/com/zq/common/entity/ApiLog.java
+++ b/civil-common-utils/src/main/java/com/zq/common/entity/ApiLog.java
-package com.zq.common.entity;
+package com.zq.api.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

--- a/civil-common-utils/src/main/java/com/zq/common/entity/SysConfig.java
+++ b/civil-common-utils/src/main/java/com/zq/common/entity/SysConfig.java
-package com.zq.common.entity;
+package com.zq.api.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

--- a/api-server/src/main/java/com/zq/api/service/ApiService.java
+++ b/api-server/src/main/java/com/zq/api/service/ApiService.java
@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zq.api.dao.ApiLogDao;
+import com.zq.api.entity.ApiLog;
 import com.zq.api.entity.ApiUser;
 import com.zq.api.feign.SysFeign;
 import com.zq.api.form.ApiForm;
@@ -11,7 +12,6 @@ import com.zq.api.form.ApiResp;
 import com.zq.api.utils.ApiUtils;
 import com.zq.api.utils.ReflectionUtils;
 import com.zq.common.config.redis.RedisUtils;
-import com.zq.common.entity.ApiLog;
 import com.zq.common.vo.ApiTokenVo;
 import com.zq.common.vo.ResultVo;
 import lombok.RequiredArgsConstructor;

--- a/api-server/src/main/java/com/zq/api/service/AppService.java
+++ b/api-server/src/main/java/com/zq/api/service/AppService.java
@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import com.zq.api.config.ConfigCache;
 import com.zq.api.constant.ApiCodeEnum;
 import com.zq.api.dao.ApiLogDao;
+import com.zq.api.entity.ApiLog;
 import com.zq.api.entity.ApiUser;
 import com.zq.api.feign.SysFeign;
 import com.zq.api.form.ApiForm;
@@ -13,7 +14,6 @@ import com.zq.api.form.ApiResp;
 import com.zq.api.utils.ApiUtils;
 import com.zq.api.utils.ReflectionUtils;
 import com.zq.common.config.security.ApiTokenUtils;
-import com.zq.common.entity.ApiLog;
 import com.zq.common.vo.ApiTokenVo;
 import com.zq.common.vo.ResultVo;
 import lombok.RequiredArgsConstructor;

--- a/portal-server/src/main/java/com/zq/portal/controller/admin/HyStatsAdminController.java
+++ b/portal-server/src/main/java/com/zq/portal/controller/admin/HyStatsAdminController.java
 package com.zq.portal.controller.admin;
-import com.zq.common.entity.VMarriageStats;
 import com.zq.common.vo.ResultVo;
+import com.zq.portal.entity.VMarriageStats;
 import com.zq.portal.service.HyStatsService;
 import com.zq.portal.vo.SearchReqVo;
 import com.zq.portal.vo.StatsReqVo;

--- a/portal-server/src/main/java/com/zq/portal/controller/app/HyStatsController.java
+++ b/portal-server/src/main/java/com/zq/portal/controller/app/HyStatsController.java
 package com.zq.portal.controller.app;
-import com.zq.common.entity.VMarriageStats;
 import com.zq.common.vo.ResultVo;
+import com.zq.portal.entity.VMarriageStats;
 import com.zq.portal.service.HyStatsService;
 import com.zq.portal.vo.StatsReqVo;
 import io.swagger.annotations.Api;
@@ -12,8 +12,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import java.util.List;
 @Api(tags = "婚姻相关接口")
 @RequiredArgsConstructor
 @RestController

--- a/portal-server/src/main/java/com/zq/portal/dao/AreaDao.java
+++ b/portal-server/src/main/java/com/zq/portal/dao/AreaDao.java
 package com.zq.portal.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zq.common.entity.SystemArea;
+import com.zq.portal.entity.SystemArea;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;

--- a/portal-server/src/main/java/com/zq/portal/dao/IDTKindDao.java
+++ b/portal-server/src/main/java/com/zq/portal/dao/IDTKindDao.java
 package com.zq.portal.dao;
-import com.zq.common.entity.SystemArea;
+import com.zq.portal.entity.SystemArea;
 import com.zq.portal.vo.CountTableDataVo;
 import com.zq.portal.vo.CyclicResultVo;
 import com.zq.portal.vo.PeopleIDTKindVo;

--- a/portal-server/src/main/java/com/zq/portal/dao/VBzCremationStatsDao.java
+++ b/portal-server/src/main/java/com/zq/portal/dao/VBzCremationStatsDao.java
 package com.zq.portal.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zq.common.entity.VBzCremationStats;
+import com.zq.portal.entity.VBzCremationStats;
 import org.springframework.stereotype.Repository;
 /**

--- a/portal-server/src/main/java/com/zq/portal/dao/VChildWelfareStatsDao.java
+++ b/portal-server/src/main/java/com/zq/portal/dao/VChildWelfareStatsDao.java
 package com.zq.portal.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zq.common.entity.VChildWelfareStats;
+import com.zq.portal.entity.VChildWelfareStats;
 import org.springframework.stereotype.Repository;
 /**

--- a/portal-server/src/main/java/com/zq/portal/dao/VDemographicsDao.java
+++ b/portal-server/src/main/java/com/zq/portal/dao/VDemographicsDao.java
 package com.zq.portal.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zq.common.entity.VDemographics;
+import com.zq.portal.entity.VDemographics;
 import org.springframework.stereotype.Repository;
 /**

--- a/portal-server/src/main/java/com/zq/portal/dao/VMarriageStatsDao.java
+++ b/portal-server/src/main/java/com/zq/portal/dao/VMarriageStatsDao.java
 package com.zq.portal.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zq.common.entity.VMarriageStats;
+import com.zq.portal.entity.VMarriageStats;
 import org.springframework.stereotype.Repository;
 /**

--- a/portal-server/src/main/java/com/zq/portal/dao/VShjzAchieveDao.java
+++ b/portal-server/src/main/java/com/zq/portal/dao/VShjzAchieveDao.java
 package com.zq.portal.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zq.common.entity.VShjzAchieve;
+import com.zq.portal.entity.VShjzStats;
-import com.zq.common.entity.VShjzStats;
 import com.zq.portal.vo.StatsVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

--- a/portal-server/src/main/java/com/zq/portal/dao/VShjzProvideDao.java
+++ b/portal-server/src/main/java/com/zq/portal/dao/VShjzProvideDao.java
 package com.zq.portal.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zq.common.entity.VShjzProvide;
+import com.zq.portal.entity.VShjzProvide;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

--- a/portal-server/src/main/java/com/zq/portal/dao/VSoorganStatsDao.java
+++ b/portal-server/src/main/java/com/zq/portal/dao/VSoorganStatsDao.java
 package com.zq.portal.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zq.common.entity.VSoorganStats;
+import com.zq.portal.entity.VSoorganStats;
 import org.springframework.stereotype.Repository;
 /**

--- a/civil-common-utils/src/main/java/com/zq/common/entity/EnbuzStats.java
+++ b/civil-common-utils/src/main/java/com/zq/common/entity/EnbuzStats.java
-package com.zq.common.entity;
+package com.zq.portal.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

--- a/civil-common-utils/src/main/java/com/zq/common/entity/SystemArea.java
+++ b/civil-common-utils/src/main/java/com/zq/common/entity/SystemArea.java
-package com.zq.common.entity;
+package com.zq.portal.entity;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

--- a/civil-common-utils/src/main/java/com/zq/common/entity/VBzCremationStats.java
+++ b/civil-common-utils/src/main/java/com/zq/common/entity/VBzCremationStats.java
-package com.zq.common.entity;
+package com.zq.portal.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

--- a/civil-common-utils/src/main/java/com/zq/common/entity/VChildWelfareStats.java
+++ b/civil-common-utils/src/main/java/com/zq/common/entity/VChildWelfareStats.java
-package com.zq.common.entity;
+package com.zq.portal.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

--- a/civil-common-utils/src/main/java/com/zq/common/entity/VDemographics.java
+++ b/civil-common-utils/src/main/java/com/zq/common/entity/VDemographics.java
-package com.zq.common.entity;
+package com.zq.portal.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

--- a/civil-common-utils/src/main/java/com/zq/common/entity/VMarriageStats.java
+++ b/civil-common-utils/src/main/java/com/zq/common/entity/VMarriageStats.java
-package com.zq.common.entity;
+package com.zq.portal.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

--- a/civil-common-utils/src/main/java/com/zq/common/entity/VShjzAchieve.java
+++ b/civil-common-utils/src/main/java/com/zq/common/entity/VShjzAchieve.java
-package com.zq.common.entity;
+package com.zq.portal.entity;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

--- a/civil-common-utils/src/main/java/com/zq/common/entity/VShjzProvide.java
+++ b/civil-common-utils/src/main/java/com/zq/common/entity/VShjzProvide.java
-package com.zq.common.entity;
+package com.zq.portal.entity;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

--- a/civil-common-utils/src/main/java/com/zq/common/entity/VShjzStats.java
+++ b/civil-common-utils/src/main/java/com/zq/common/entity/VShjzStats.java
-package com.zq.common.entity;
+package com.zq.portal.entity;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

--- a/civil-common-utils/src/main/java/com/zq/common/entity/VSoorganStats.java
+++ b/civil-common-utils/src/main/java/com/zq/common/entity/VSoorganStats.java
-package com.zq.common.entity;
+package com.zq.portal.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

--- a/portal-server/src/main/java/com/zq/portal/service/AreaService.java
+++ b/portal-server/src/main/java/com/zq/portal/service/AreaService.java
 package com.zq.portal.service;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.zq.common.entity.SystemArea;
 import com.zq.portal.dao.AreaDao;
+import com.zq.portal.entity.SystemArea;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

--- a/portal-server/src/main/java/com/zq/portal/service/BzStatsService.java
+++ b/portal-server/src/main/java/com/zq/portal/service/BzStatsService.java
@@ -4,12 +4,12 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zq.common.config.redis.RedisUtils;
-import com.zq.common.entity.SystemArea;
-import com.zq.common.entity.VBzCremationStats;
 import com.zq.common.utils.PagingUtils;
 import com.zq.portal.dao.AreaDao;
 import com.zq.portal.dao.BzStatsDao;
 import com.zq.portal.dao.VBzCremationStatsDao;
+import com.zq.portal.entity.SystemArea;
+import com.zq.portal.entity.VBzCremationStats;
 import com.zq.portal.manager.PortalCacheKeys;
 import com.zq.portal.vo.SearchReqVo;
 import com.zq.portal.vo.StatsReqVo;

--- a/portal-server/src/main/java/com/zq/portal/service/CjStatsService.java
+++ b/portal-server/src/main/java/com/zq/portal/service/CjStatsService.java
@@ -2,11 +2,11 @@ package com.zq.portal.service;
 import cn.hutool.core.util.StrUtil;
 import com.zq.common.config.redis.RedisUtils;
-import com.zq.common.entity.SystemArea;
 import com.zq.common.utils.PagingUtils;
 import com.zq.common.utils.StringUtils;
 import com.zq.portal.dao.AreaDao;
 import com.zq.portal.dao.CjStatsDao;
+import com.zq.portal.entity.SystemArea;
 import com.zq.portal.manager.PortalCacheKeys;
 import com.zq.portal.vo.SearchReqVo;
 import com.zq.portal.vo.StatsReqVo;

--- a/portal-server/src/main/java/com/zq/portal/service/DemographicsService.java
+++ b/portal-server/src/main/java/com/zq/portal/service/DemographicsService.java
 package com.zq.portal.service;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.zq.common.entity.VDemographics;
 import com.zq.portal.dao.VDemographicsDao;
+import com.zq.portal.entity.VDemographics;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

--- a/portal-server/src/main/java/com/zq/portal/service/EtStatsService.java
+++ b/portal-server/src/main/java/com/zq/portal/service/EtStatsService.java
@@ -5,12 +5,12 @@ import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zq.common.config.redis.RedisUtils;
-import com.zq.common.entity.SystemArea;
-import com.zq.common.entity.VChildWelfareStats;
 import com.zq.common.utils.PagingUtils;
 import com.zq.portal.dao.AreaDao;
 import com.zq.portal.dao.EtStatsDao;
 import com.zq.portal.dao.VChildWelfareStatsDao;
+import com.zq.portal.entity.SystemArea;
+import com.zq.portal.entity.VChildWelfareStats;
 import com.zq.portal.manager.PortalCacheKeys;
 import com.zq.portal.vo.SearchReqVo;
 import com.zq.portal.vo.StatsReqVo;

--- a/portal-server/src/main/java/com/zq/portal/service/HyStatsService.java
+++ b/portal-server/src/main/java/com/zq/portal/service/HyStatsService.java
@@ -5,13 +5,13 @@ import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zq.common.config.redis.RedisUtils;
-import com.zq.common.entity.SystemArea;
-import com.zq.common.entity.VMarriageStats;
 import com.zq.common.utils.PagingUtils;
 import com.zq.common.utils.StringUtils;
 import com.zq.portal.dao.AreaDao;
 import com.zq.portal.dao.HyStatsDao;
 import com.zq.portal.dao.VMarriageStatsDao;
+import com.zq.portal.entity.SystemArea;
+import com.zq.portal.entity.VMarriageStats;
 import com.zq.portal.manager.PortalCacheKeys;
 import com.zq.portal.vo.LineDataVo;
 import com.zq.portal.vo.SearchReqVo;

--- a/portal-server/src/main/java/com/zq/portal/service/PeopleService.java
+++ b/portal-server/src/main/java/com/zq/portal/service/PeopleService.java
 package com.zq.portal.service;
-import com.zq.common.entity.SystemArea;
 import com.zq.common.vo.PageVo;
 import com.zq.common.vo.ResultVo;
 import com.zq.portal.dao.AreaDao;
 import com.zq.portal.dao.IDTKindDao;
 import com.zq.portal.dao.SearchDao;
+import com.zq.portal.entity.SystemArea;
 import com.zq.portal.manager.PortalCacheManager;
 import com.zq.portal.vo.*;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.ArrayList;

--- a/portal-server/src/main/java/com/zq/portal/service/ShjzStatsService.java
+++ b/portal-server/src/main/java/com/zq/portal/service/ShjzStatsService.java
@@ -5,8 +5,6 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zq.common.config.redis.RedisUtils;
-import com.zq.common.entity.EnbuzStats;
-import com.zq.common.entity.SystemArea;
 import com.zq.common.utils.PagingUtils;
 import com.zq.common.utils.StringUtils;
 import com.zq.portal.constant.CityEnum;
@@ -14,6 +12,8 @@ import com.zq.portal.dao.AreaDao;
 import com.zq.portal.dao.ShjzStatsDao;
 import com.zq.portal.dao.VShjzAchieveDao;
 import com.zq.portal.dao.VShjzProvideDao;
+import com.zq.portal.entity.EnbuzStats;
+import com.zq.portal.entity.SystemArea;
 import com.zq.portal.manager.PortalCacheKeys;
 import com.zq.portal.vo.SearchReqVo;
 import com.zq.portal.vo.StatsReqVo;

--- a/portal-server/src/main/java/com/zq/portal/service/ShzzStatsService.java
+++ b/portal-server/src/main/java/com/zq/portal/service/ShzzStatsService.java
@@ -5,12 +5,12 @@ import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zq.common.config.redis.RedisUtils;
-import com.zq.common.entity.SystemArea;
-import com.zq.common.entity.VSoorganStats;
 import com.zq.common.utils.PagingUtils;
 import com.zq.portal.dao.AreaDao;
 import com.zq.portal.dao.ShzzStatsDao;
 import com.zq.portal.dao.VSoorganStatsDao;
+import com.zq.portal.entity.SystemArea;
+import com.zq.portal.entity.VSoorganStats;
 import com.zq.portal.manager.PortalCacheKeys;
 import com.zq.portal.vo.SearchReqVo;
 import com.zq.portal.vo.StatsReqVo;

--- a/portal-server/src/main/java/com/zq/portal/service/StatsService.java
+++ b/portal-server/src/main/java/com/zq/portal/service/StatsService.java
@@ -2,8 +2,8 @@ package com.zq.portal.service;
 import cn.hutool.core.util.NumberUtil;
 import com.zq.common.config.redis.RedisUtils;
-import com.zq.common.entity.SystemArea;
 import com.zq.portal.dao.*;
+import com.zq.portal.entity.SystemArea;
 import com.zq.portal.manager.PortalCacheKeys;
 import com.zq.portal.vo.SearchReqVo;
 import com.zq.portal.vo.StatsReqVo;

--- a/portal-server/src/main/java/com/zq/portal/service/YlStatsService.java
+++ b/portal-server/src/main/java/com/zq/portal/service/YlStatsService.java
@@ -2,9 +2,9 @@ package com.zq.portal.service;
 import cn.hutool.core.util.NumberUtil;
 import com.zq.common.config.redis.RedisUtils;
-import com.zq.common.entity.SystemArea;
 import com.zq.portal.dao.AreaDao;
 import com.zq.portal.dao.YlStatsDao;
+import com.zq.portal.entity.SystemArea;
 import com.zq.portal.manager.PortalCacheKeys;
 import com.zq.portal.vo.StatsReqVo;
 import com.zq.portal.vo.StatsVo;

--- a/portal-server/src/main/java/com/zq/portal/task/StatsTimingTask.java
+++ b/portal-server/src/main/java/com/zq/portal/task/StatsTimingTask.java
 package com.zq.portal.task;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.zq.common.entity.SystemArea;
 import com.zq.portal.dao.AreaDao;
+import com.zq.portal.entity.SystemArea;
 import com.zq.portal.service.*;
 import com.zq.portal.vo.StatsReqVo;
 import lombok.RequiredArgsConstructor;

--- a/portal-server/src/main/java/com/zq/portal/vo/SearchReqVo.java
+++ b/portal-server/src/main/java/com/zq/portal/vo/SearchReqVo.java
 package com.zq.portal.vo;
-import com.zq.common.entity.SystemArea;
 import com.zq.common.vo.PageReqVo;
+import com.zq.portal.entity.SystemArea;
 import lombok.*;
 @Data

--- a/portal-server/src/main/java/com/zq/portal/vo/StatsReqVo.java
+++ b/portal-server/src/main/java/com/zq/portal/vo/StatsReqVo.java
 package com.zq.portal.vo;
-import com.zq.common.entity.SystemArea;
+import com.zq.portal.entity.SystemArea;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

--- a/portal-server/src/main/resources/mapper/AreaMapper.xml
+++ b/portal-server/src/main/resources/mapper/AreaMapper.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zq.portal.dao.AreaDao">
-    <select id="getAreaList" resultType="com.zq.common.entity.SystemArea"
+    <select id="getAreaList" resultType="com.zq.portal.entity.SystemArea"
-            parameterType="com.zq.common.entity.SystemArea">
+            parameterType="com.zq.portal.entity.SystemArea">
        SELECT
        a.id,
        CONCAT(
@@ -28,7 +28,7 @@
    </select>
-    <select id="getCityAreaList" resultType="com.zq.common.entity.SystemArea">
+    <select id="getCityAreaList" resultType="com.zq.portal.entity.SystemArea">
        select id,
               name
        FROM system_area
@@ -43,7 +43,7 @@
          and a.parent_id > 0
    </select>
-    <select id="getAreaByType" resultType="com.zq.common.entity.SystemArea" parameterType="string">
+    <select id="getAreaByType" resultType="com.zq.portal.entity.SystemArea" parameterType="string">
        select id as id, type ,parent_id as parentId,name
        from system_area where type =#{type}
        <if test="parentId!=null and parentId!='' and type!=2">
@@ -51,13 +51,13 @@
        </if>
    </select>
-    <select id="findKid" parameterType="java.lang.String" resultType="com.zq.common.entity.SystemArea">
+    <select id="findKid" parameterType="java.lang.String" resultType="com.zq.portal.entity.SystemArea">
        SELECT id as id, code, type, parent_id as parentId, name
        FROM system_area a
        where a.parent_id = #{value}
    </select>
-    <select id="getAreaByCode" parameterType="java.lang.String" resultType="com.zq.common.entity.SystemArea">
+    <select id="getAreaByCode" parameterType="java.lang.String" resultType="com.zq.portal.entity.SystemArea">
        SELECT id as id, code, type, parent_id as parentId, name
        FROM system_area a
        where a.id = #{value}

--- a/sys-server/src/main/java/com/zq/system/modules/system/dao/AppVersionDao.java
+++ b/sys-server/src/main/java/com/zq/system/modules/system/dao/AppVersionDao.java
 package com.zq.system.modules.system.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zq.common.entity.AppVersion;
+import com.zq.system.modules.system.entity.AppVersion;
 import org.springframework.stereotype.Repository;
 /**

--- a/sys-server/src/main/java/com/zq/system/modules/system/dao/PfuserDao.java
+++ b/sys-server/src/main/java/com/zq/system/modules/system/dao/PfuserDao.java
@@ -3,7 +3,7 @@ package com.zq.system.modules.system.dao;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zq.common.constant.DBName;
-import com.zq.common.entity.Pfuser;
+import com.zq.system.modules.system.entity.Pfuser;
 import org.springframework.stereotype.Repository;
 /**

--- a/civil-common-utils/src/main/java/com/zq/common/entity/AppVersion.java
+++ b/civil-common-utils/src/main/java/com/zq/common/entity/AppVersion.java
-package com.zq.common.entity;
+package com.zq.system.modules.system.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

--- a/civil-common-utils/src/main/java/com/zq/common/entity/Pfuser.java
+++ b/civil-common-utils/src/main/java/com/zq/common/entity/Pfuser.java
-package com.zq.common.entity;
+package com.zq.system.modules.system.entity;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

--- a/sys-server/src/main/java/com/zq/system/modules/system/rest/api/VersionController.java
+++ b/sys-server/src/main/java/com/zq/system/modules/system/rest/api/VersionController.java
 package com.zq.system.modules.system.rest.api;
-import com.zq.common.entity.AppVersion;
 import com.zq.common.vo.PageVo;
 import com.zq.common.vo.ResultVo;
 import com.zq.system.modules.system.domain.vo.AppVersionFindVo;
+import com.zq.system.modules.system.entity.AppVersion;
 import com.zq.system.modules.system.service.VersionService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

--- a/sys-server/src/main/java/com/zq/system/modules/system/service/VersionService.java
+++ b/sys-server/src/main/java/com/zq/system/modules/system/service/VersionService.java
@@ -2,11 +2,11 @@ package com.zq.system.modules.system.service;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.zq.common.entity.AppVersion;
 import com.zq.common.utils.PagingUtils;
 import com.zq.common.vo.PageVo;
-import com.zq.system.modules.system.domain.vo.AppVersionFindVo;
 import com.zq.system.modules.system.dao.AppVersionDao;
+import com.zq.system.modules.system.domain.vo.AppVersionFindVo;
+import com.zq.system.modules.system.entity.AppVersion;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

--- a/sys-server/src/main/java/com/zq/system/modules/system/service/impl/UserServiceImpl.java
+++ b/sys-server/src/main/java/com/zq/system/modules/system/service/impl/UserServiceImpl.java
@@ -21,7 +21,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zq.common.config.redis.RedisUtils;
 import com.zq.common.config.security.ApiTokenUtils;
 import com.zq.common.constant.SystemName;
-import com.zq.common.entity.Pfuser;
 import com.zq.common.utils.AssertUtils;
 import com.zq.common.utils.StringUtils;
 import com.zq.common.utils.UploadUtils;
@@ -35,6 +34,7 @@ import com.zq.system.modules.system.domain.Job;
 import com.zq.system.modules.system.domain.Role;
 import com.zq.system.modules.system.domain.User;
 import com.zq.system.modules.system.domain.vo.LoginVo;
+import com.zq.system.modules.system.entity.Pfuser;
 import com.zq.system.modules.system.repository.DeptRepository;
 import com.zq.system.modules.system.repository.JobRepository;
 import com.zq.system.modules.system.repository.RoleRepository;