解决冲突

auth-service/src/main/resources/mybatis-generator/generatorConfig.xml

@@ -38,7 +38,7 @@
             targetPackage     指定生成的model生成所在的包名
             targetProject     指定在该项目下所在的路径
         -->
-        <javaModelGenerator targetPackage="com.hungraim.ism.pojo.entity.system.role"
+        <javaModelGenerator targetPackage="com.hungraim.ism.pojo.entity.role"
                             targetProject="E:/workspace/projects/long-term-care/common/common-core/src/main/java">
 
             <!-- 是否允许子包，即targetPackage.schemaName.tableName -->

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/SysConfig/ChCfgProperties.java → common/common-core/src/main/java/com/hungraim/ism/pojo/entity/SysConfig/ChCfgProperties.java

-package com.hungraim.ism.pojo.entity.system.SysConfig;
+package com.hungraim.ism.pojo.entity.SysConfig;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/dept/ChFndDept.java → common/common-core/src/main/java/com/hungraim/ism/pojo/entity/dept/ChFndDept.java

-package com.hungraim.ism.pojo.entity.system.dept;
+package com.hungraim.ism.pojo.entity.dept;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/dept/ChFndDeptCate.java → common/common-core/src/main/java/com/hungraim/ism/pojo/entity/dept/ChFndDeptCate.java

-package com.hungraim.ism.pojo.entity.system.dept;
+package com.hungraim.ism.pojo.entity.dept;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/disable/ChDepositAcct.java → common/common-core/src/main/java/com/hungraim/ism/pojo/entity/disable/ChDepositAcct.java

-package com.hungraim.ism.pojo.entity.system.disable;
+package com.hungraim.ism.pojo.entity.disable;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.util.Date;
 
+/**
+ * 失能人员账户
+ */
 @Data
 @TableName("CH_DEPOSIT_ACCT")
 public class ChDepositAcct {

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/disable/chDepositTrns.java → common/common-core/src/main/java/com/hungraim/ism/pojo/entity/disable/ChDepositTrns.java

-package com.hungraim.ism.pojo.entity.system.disable;
+package com.hungraim.ism.pojo.entity.disable;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.util.Date;
 
+/**
+ * 失能人员账户交易
+ */
 @Data
 @TableName("CH_DEPOSIT_TRNS")
-public class chDepositTrns {
+public class ChDepositTrns {
     /**
      * 交易ID
      */

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/disable/chDisableApplyHis.java → common/common-core/src/main/java/com/hungraim/ism/pojo/entity/disable/ChDisableApplyHis.java

-package com.hungraim.ism.pojo.entity.system.disable;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
+package com.hungraim.ism.pojo.entity.disable;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 失能人员申请历史
+ */
 @Data
 @TableName("CH_DISABLE_APPLY_HIS")
-public class chDisableApplyHis {
+public class ChDisableApplyHis implements Serializable {
     /**
      * 失能申请历史id
      */
-    private Integer applyHisId;
+    private Long applyHisId;
 
     /**
      * 失能申请id
      */
-    private Integer applyId;
+    private Long applyId;
 
     /**
      * 机构代码
@@ -77,7 +81,7 @@ public class chDisableApplyHis {
     /**
      * 户籍   本市：0；非本市：1
      */
-    private Integer regist;
+    private Short regist;
 
     /**
      * 疾病
@@ -87,7 +91,7 @@ public class chDisableApplyHis {
     /**
      * 服务方式
      */
-    private Integer srvModeId;
+    private Long srvModeId;
 
     /**
      * 疾病描述
@@ -97,7 +101,7 @@ public class chDisableApplyHis {
     /**
      * 医保类型    城镇：1；非城镇：0
      */
-    private Integer medicalType;
+    private Short medicalType;
 
     /**
      * 社保卡号
@@ -107,7 +111,7 @@ public class chDisableApplyHis {
     /**
      * 意向护理机构
      */
-    private Integer srvOrganId;
+    private Long srvOrganId;
 
     /**
      * 代办人姓名
@@ -142,12 +146,12 @@ public class chDisableApplyHis {
     /**
      * 鉴定标准配置id
      */
-    private Integer aprConfId;
+    private Long aprConfId;
 
     /**
      * 申请状态   未提交:0;待审核:1;审核通过:2;不通过：3;删除:4;撤销:5
      */
-    private Integer applyStatus;
+    private Short applyStatus;
 
     /**
      * 审核人
@@ -167,7 +171,7 @@ public class chDisableApplyHis {
     /**
      * 创建人
      */
-    private Integer defineEmg;
+    private Long defineEmg;
 
     /**
      * 创建时间
@@ -177,7 +181,7 @@ public class chDisableApplyHis {
     /**
      * 终止人
      */
-    private Integer endEmg;
+    private Long endEmg;
 
     /**
      * 终止人终止时间
@@ -192,7 +196,7 @@ public class chDisableApplyHis {
     /**
      * 首次操作人
      */
-    private Integer fcu;
+    private Long fcu;
 
     /**
      * 末次操作时间
@@ -202,12 +206,12 @@ public class chDisableApplyHis {
     /**
      * 末次操作人
      */
-    private Integer lcu;
+    private Long lcu;
 
     /**
      * 申请机构
      */
-    private Integer aplOrganId;
+    private Long aplOrganId;
 
     /**
      * 现住地址省份
@@ -232,22 +236,22 @@ public class chDisableApplyHis {
     /**
      * 最新鉴定任务ID
      */
-    private Integer lastTaskId;
+    private Long lastTaskId;
 
     /**
      * 数据来源 网厅：0，核心：1，微信：2
      */
-    private Integer dataFrom;
+    private Short dataFrom;
 
     /**
      * 网厅创建人
      */
-    private Integer webDefineEmp;
+    private Long webDefineEmp;
 
     /**
      * 网厅终止人
      */
-    private Integer webEndEmp;
+    private Long webEndEmp;
 
     /**
      * 街道
@@ -257,7 +261,7 @@ public class chDisableApplyHis {
     /**
      * 鉴定分数总计
      */
-    private Integer aprTotalScore;
+    private Short aprTotalScore;
 
     /**
      * 接受评定省
@@ -287,22 +291,22 @@ public class chDisableApplyHis {
     /**
      * 接受评定类型 现在址：0,机构地址：1,其他：2
      */
-    private Integer acptType;
+    private Short acptType;
 
     /**
      * 疾病大类
      */
-    private Integer diseTypeF;
+    private Long diseTypeF;
 
     /**
      * 疾病小类
      */
-    private Integer diseTypeS;
+    private Long diseTypeS;
 
     /**
      * 服务配置模式ID
      */
-    private Integer cfgModeId;
+    private Long cfgModeId;
 
     /**
      * 复评原因
@@ -317,12 +321,12 @@ public class chDisableApplyHis {
     /**
      * 申请方式
      */
-    private Integer applyMethod;
+    private Short applyMethod;
 
     /**
      * 首次申请ID
      */
-    private Integer firstApplyId;
+    private Long firstApplyId;
 
     /**
      * 现住址经度
@@ -367,7 +371,7 @@ public class chDisableApplyHis {
     /**
      * 现住地址路/街（0路，1街，2村）
      */
-    private Integer addressRoadType;
+    private Short addressRoadType;
 
     /**
      * 现住地址号弄
@@ -377,7 +381,7 @@ public class chDisableApplyHis {
     /**
      * 现住地址号/弄（0弄，1号）
      */
-    private Integer addressNumberType;
+    private Short addressNumberType;
 
     /**
      * 接受评定地址路街
@@ -387,7 +391,7 @@ public class chDisableApplyHis {
     /**
      * 接受评定地址路/街（0路，1街，2村）
      */
-    private Integer acptRoadType;
+    private Short acptRoadType;
 
     /**
      * 接受评定地址号弄
@@ -397,7 +401,7 @@ public class chDisableApplyHis {
     /**
      * 接受评定地址号/弄（0弄，1号）
      */
-    private Integer acptNumberType;
+    private Short acptNumberType;
 
     /**
      * 代办人现住止路街
@@ -407,7 +411,7 @@ public class chDisableApplyHis {
     /**
      * 代办人现住止路/街（0路，1街，2村）
      */
-    private Integer operRoadType;
+    private Short operRoadType;
 
     /**
      * 代办人现住止号弄
@@ -417,7 +421,7 @@ public class chDisableApplyHis {
     /**
      * 代办人现住止号/弄（0弄，1号）
      */
-    private Integer operNumberType;
+    private Short operNumberType;
 
     /**
      * 接受服务地址省
@@ -447,7 +451,7 @@ public class chDisableApplyHis {
     /**
      * 接受服务地址路/街（0路，1街，2村）
      */
-    private Integer acptSrvRoadType;
+    private Short acptSrvRoadType;
 
     /**
      * 接受服务地址号弄
@@ -457,7 +461,7 @@ public class chDisableApplyHis {
     /**
      * 接受服务地址号/弄（0弄，1号）
      */
-    private Integer acptSrvNumberType;
+    private Short acptSrvNumberType;
 
     /**
      * 接受服务地址详细地址
@@ -467,7 +471,7 @@ public class chDisableApplyHis {
     /**
      * 接受服务地址类型（现在址：0,护理机构地址：1,其他：2）
      */
-    private Integer acptSrvType;
+    private Short acptSrvType;
 
     /**
      * 接受服务地址经度
@@ -521,7 +525,7 @@ public class chDisableApplyHis {
 
     /**
      * 病史简述1
-  1. 曾患的重大疾病、外伤史、传染病史
+     * 1. 曾患的重大疾病、外伤史、传染病史
      */
     private String medicalHistory1;
 
@@ -558,17 +562,17 @@ public class chDisableApplyHis {
     /**
      * 肢体残缺  0有，1无
      */
-    private Integer bodyIncomplete;
+    private Short bodyIncomplete;
 
     /**
      * 视力障碍   0有，1无
      */
-    private Integer visionObstacle;
+    private Short visionObstacle;
 
     /**
      * 听力障碍   0有，1无
      */
-    private Integer hearingObstacle;
+    private Short hearingObstacle;
 
     /**
      * 病史简述
@@ -583,7 +587,7 @@ public class chDisableApplyHis {
     /**
      * 历史操作人
      */
-    private Integer hisEmp;
+    private Long hisEmp;
 
     /**
      * 代办人固话
@@ -593,5 +597,7 @@ public class chDisableApplyHis {
     /**
      * 待遇类型(1失能、0失智)
      */
-    private Integer treatmentType;
+    private Short treatmentType;
+
+    private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/disable/chDisableInfoChange.java → common/common-core/src/main/java/com/hungraim/ism/pojo/entity/disable/ChDisableInfoChange.java

-package com.hungraim.ism.pojo.entity.system.disable;
+package com.hungraim.ism.pojo.entity.disable;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.util.Date;
 
+/**
+ * 失能人员信息变更
+ */
 @Data
 @TableName("CH_DISABLE_INFO_CHANGE")
-public class chDisableInfoChange {
+public class ChDisableInfoChange {
     /**
      * 变更id
      */

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/disable/chDisableLongitude.java → common/common-core/src/main/java/com/hungraim/ism/pojo/entity/disable/ChDisableLongitude.java

-package com.hungraim.ism.pojo.entity.system.disable;
+package com.hungraim.ism.pojo.entity.disable;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.util.Date;
 
+/**
+ * 失能人员地址经纬度
+ */
 @Data
 @TableName("CH_DISABLE_LONGITUDE")
-public class chDisableLongitude {
+public class ChDisableLongitude {
     /**
      * 经纬度ID
      */

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/disable/chDisableRiskLevel.java → common/common-core/src/main/java/com/hungraim/ism/pojo/entity/disable/ChDisableRiskLevel.java

-package com.hungraim.ism.pojo.entity.system.disable;
+package com.hungraim.ism.pojo.entity.disable;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.util.Date;
 
+/**
+ * 失能人员风险等级
+ */
 @Data
 @TableName("CH_DISABLE_RISK_LEVEL")
-public class chDisableRiskLevel {
+public class ChDisableRiskLevel {
     /**
      * 主键ID
      */

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/disable/chDisableRiskLevelHis.java → common/common-core/src/main/java/com/hungraim/ism/pojo/entity/disable/ChDisableRiskLevelHis.java

-package com.hungraim.ism.pojo.entity.system.disable;
+package com.hungraim.ism.pojo.entity.disable;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.util.Date;
 
+/**
+ * 失能人员风险等级历史
+ */
 @Data
 @TableName("CH_DISABLE_RISK_LEVEL_HIS")
-public class chDisableRiskLevelHis {
+public class ChDisableRiskLevelHis {
     /**
      * 主键ID
      */

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/disable/chDisableTreatment.java → common/common-core/src/main/java/com/hungraim/ism/pojo/entity/disable/ChDisableTreatment.java

-package com.hungraim.ism.pojo.entity.system.disable;
+package com.hungraim.ism.pojo.entity.disable;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -6,9 +6,12 @@ import lombok.Data;
 import java.math.BigDecimal;
 import java.util.Date;
 
+/**
+ * 失能人员待遇
+ */
 @Data
 @TableName("CH_DISABLE_TREATMENT")
-public class chDisableTreatment {
+public class ChDisableTreatment {
     /**
      * 待遇历史ID
      */

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/disable/chFndApplyStatusType.java → common/common-core/src/main/java/com/hungraim/ism/pojo/entity/disable/ChFndApplyStatusType.java

-package com.hungraim.ism.pojo.entity.system.disable;
+package com.hungraim.ism.pojo.entity.disable;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+/**
+ * 失能申请状态基
+ */
 @Data
 @TableName("CH_FND_APPLY_STATUS_TYPE")
-public class chFndApplyStatusType {
+public class ChFndApplyStatusType {
     /**
      * 申请状态代码
      */

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/disable/tppesChDisabilityInfo1.java → common/common-core/src/main/java/com/hungraim/ism/pojo/entity/disable/TppesChDisabilityInfo1.java

-package com.hungraim.ism.pojo.entity.system.disable;
+package com.hungraim.ism.pojo.entity.disable;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -6,9 +6,12 @@ import lombok.Data;
 import java.math.BigDecimal;
 import java.util.Date;
 
+/**
+ * ipad失能人员个人信息
+ */
 @Data
 @TableName("TPPES_CH_DISABILITY_INFO1")
-public class tppesChDisabilityInfo1 {
+public class TppesChDisabilityInfo1 {
     /**
      * 失能人员ID
      */

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/disable/tppesFndChUserInfo1.java → common/common-core/src/main/java/com/hungraim/ism/pojo/entity/disable/TppesFndChUserInfo1.java

-package com.hungraim.ism.pojo.entity.system.disable;
+package com.hungraim.ism.pojo.entity.disable;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -6,9 +6,12 @@ import lombok.Data;
 import java.math.BigDecimal;
 import java.util.Date;
 
+/**
+ * 长护失能和护理人员信息
+ */
 @Data
 @TableName("TPPES_FND_CH_USER_INFO1")
-public class tppesFndChUserInfo1 {
+public class TppesFndChUserInfo1 {
     /**
      * 主键
      */

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/eval/ChAprReportEvaluate.java → common/common-core/src/main/java/com/hungraim/ism/pojo/entity/eval/ChAprReportEvaluate.java

-package com.hungraim.ism.pojo.entity.system.eval;
+package com.hungraim.ism.pojo.entity.eval;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/eval/ChCfgAprGroupDetail.java → common/common-core/src/main/java/com/hungraim/ism/pojo/entity/eval/ChCfgAprGroupDetail.java

-package com.hungraim.ism.pojo.entity.system.eval;
+package com.hungraim.ism.pojo.entity.eval;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/role/ChFndAcModule.java → common/common-core/src/main/java/com/hungraim/ism/pojo/entity/role/ChFndAcModule.java

-package com.hungraim.ism.pojo.entity.system.role;
+package com.hungraim.ism.pojo.entity.role;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/role/ChFndAcModuleUrlBak.java → common/common-core/src/main/java/com/hungraim/ism/pojo/entity/role/ChFndAcModuleUrlBak.java

-package com.hungraim.ism.pojo.entity.system.role;
+package com.hungraim.ism.pojo.entity.role;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/role/ChFndAcRole.java → common/common-core/src/main/java/com/hungraim/ism/pojo/entity/role/ChFndAcRole.java

-package com.hungraim.ism.pojo.entity.system.role;
+package com.hungraim.ism.pojo.entity.role;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/role/ChFndAcRoleModule.java → common/common-core/src/main/java/com/hungraim/ism/pojo/entity/role/ChFndAcRoleModule.java

-package com.hungraim.ism.pojo.entity.system.role;
+package com.hungraim.ism.pojo.entity.role;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/role/ChFndAcUserRole.java → common/common-core/src/main/java/com/hungraim/ism/pojo/entity/role/ChFndAcUserRole.java

-package com.hungraim.ism.pojo.entity.system.role;
+package com.hungraim.ism.pojo.entity.role;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/role/TppesChRole.java → common/common-core/src/main/java/com/hungraim/ism/pojo/entity/role/TppesChRole.java

-package com.hungraim.ism.pojo.entity.system.role;
+package com.hungraim.ism.pojo.entity.role;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/role/TppesChRoleMenu.java → common/common-core/src/main/java/com/hungraim/ism/pojo/entity/role/TppesChRoleMenu.java

-package com.hungraim.ism.pojo.entity.system.role;
+package com.hungraim.ism.pojo.entity.role;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/role/TppesChUserRole.java → common/common-core/src/main/java/com/hungraim/ism/pojo/entity/role/TppesChUserRole.java

-package com.hungraim.ism.pojo.entity.system.role;
+package com.hungraim.ism.pojo.entity.role;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/serviceManage/ChCfgAcc.java → common/common-core/src/main/java/com/hungraim/ism/pojo/entity/serviceManage/ChCfgAcc.java

-package com.hungraim.ism.pojo.entity.system.serviceManage;
+package com.hungraim.ism.pojo.entity.serviceManage;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/serviceManage/ChSrvProgram.java → common/common-core/src/main/java/com/hungraim/ism/pojo/entity/serviceManage/ChSrvProgram.java

-package com.hungraim.ism.pojo.entity.system.serviceManage;
+package com.hungraim.ism.pojo.entity.serviceManage;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/serviceManage/ChSrvSendEvaluate.java → common/common-core/src/main/java/com/hungraim/ism/pojo/entity/serviceManage/ChSrvSendEvaluate.java

-package com.hungraim.ism.pojo.entity.system.serviceManage;
+package com.hungraim.ism.pojo.entity.serviceManage;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/serviceManage/TppesChh5Picture1.java → common/common-core/src/main/java/com/hungraim/ism/pojo/entity/serviceManage/TppesChh5Picture1.java

-package com.hungraim.ism.pojo.entity.system.serviceManage;
+package com.hungraim.ism.pojo.entity.serviceManage;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/SysConfig/ChCfgPropertiesMapper.java

 package com.hungraim.ism.mapper.SysConfig;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.SysConfig.ChCfgProperties;
+import com.hungraim.ism.pojo.entity.SysConfig.ChCfgProperties;
 
 public interface ChCfgPropertiesMapper extends BaseMapper<ChCfgProperties> {
 }
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/dept/ChFndDeptCateMapper.java

 package com.hungraim.ism.mapper.dept;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.dept.ChFndDeptCate;
+import com.hungraim.ism.pojo.entity.dept.ChFndDeptCate;
 
 public interface ChFndDeptCateMapper extends BaseMapper<ChFndDeptCate> {
 }
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/dept/ChFndDeptMapper.java

 package com.hungraim.ism.mapper.dept;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.dept.ChFndDept;
+import com.hungraim.ism.pojo.entity.dept.ChFndDept;
 
 public interface ChFndDeptMapper  extends BaseMapper<ChFndDept> {
 }
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/disable/ChDepositAcctMapper.java

 package com.hungraim.ism.mapper.disable;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.disable.ChDepositAcct;
+import com.hungraim.ism.pojo.entity.disable.ChDepositAcct;
 
 public interface ChDepositAcctMapper extends BaseMapper<ChDepositAcct> {
 }
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/disable/chDepositTrnsMapper.java

 package com.hungraim.ism.mapper.disable;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.disable.chDepositTrns;
+import com.hungraim.ism.pojo.entity.disable.chDepositTrns;
 
 public interface chDepositTrnsMapper extends BaseMapper<chDepositTrns> {
 }
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/disable/chDisableInfoChangeMapper.java

 package com.hungraim.ism.mapper.disable;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.disable.chDisableInfoChange;
+import com.hungraim.ism.pojo.entity.disable.chDisableInfoChange;
 
 public interface chDisableInfoChangeMapper extends BaseMapper<chDisableInfoChange> {
 }
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/disable/chDisableLongitudeMapper.java

 package com.hungraim.ism.mapper.disable;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.disable.chDisableLongitude;
+import com.hungraim.ism.pojo.entity.disable.chDisableLongitude;
 
 public interface chDisableLongitudeMapper extends BaseMapper<chDisableLongitude> {
 }
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/disable/chDisableRiskLevelHisMapper.java

 package com.hungraim.ism.mapper.disable;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.disable.chDisableRiskLevelHis;
+import com.hungraim.ism.pojo.entity.disable.chDisableRiskLevelHis;
 
 public interface chDisableRiskLevelHisMapper extends BaseMapper<chDisableRiskLevelHis> {
 }
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/disable/chDisableRiskLevelMapper.java

 package com.hungraim.ism.mapper.disable;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.disable.chDisableRiskLevel;
+import com.hungraim.ism.pojo.entity.disable.chDisableRiskLevel;
 
 public interface chDisableRiskLevelMapper extends BaseMapper<chDisableRiskLevel> {
 }
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/disable/chDisableTreatmentMapper.java

 package com.hungraim.ism.mapper.disable;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.disable.chDisableTreatment;
+import com.hungraim.ism.pojo.entity.disable.chDisableTreatment;
 
 public interface chDisableTreatmentMapper extends BaseMapper<chDisableTreatment> {
 }
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/disable/chFndApplyStatusTypeMapper.java

 package com.hungraim.ism.mapper.disable;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.disable.chFndApplyStatusType;
+import com.hungraim.ism.pojo.entity.disable.chFndApplyStatusType;
 
 public interface chFndApplyStatusTypeMapper extends BaseMapper<chFndApplyStatusType> {
 }
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/disable/tppesChDisabilityInfo1Mapper.java

 package com.hungraim.ism.mapper.disable;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.disable.tppesChDisabilityInfo1;
+import com.hungraim.ism.pojo.entity.disable.tppesChDisabilityInfo1;
 
 public interface tppesChDisabilityInfo1Mapper extends BaseMapper<tppesChDisabilityInfo1> {
 }
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/disable/tppesFndChUserInfo1Mapper.java

 package com.hungraim.ism.mapper.disable;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.disable.tppesFndChUserInfo1;
+import com.hungraim.ism.pojo.entity.disable.tppesFndChUserInfo1;
 
 public interface tppesFndChUserInfo1Mapper extends BaseMapper<tppesFndChUserInfo1> {
 }
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/eval/ChAprReportEvaluateMapper.java

 package com.hungraim.ism.mapper.eval;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.eval.ChAprReportEvaluate;
+import com.hungraim.ism.pojo.entity.eval.ChAprReportEvaluate;
 
 public interface ChAprReportEvaluateMapper extends BaseMapper<ChAprReportEvaluate> {
 }
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/eval/ChCfgAprGroupDetailMapper.java

 package com.hungraim.ism.mapper.eval;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.eval.ChCfgAprGroupDetail;
+import com.hungraim.ism.pojo.entity.eval.ChCfgAprGroupDetail;
 
 public interface ChCfgAprGroupDetailMapper extends BaseMapper<ChCfgAprGroupDetail> {
 }
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/role/ChFndAcModuleMapper.java

 package com.hungraim.ism.mapper.role;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.role.ChFndAcModule;
+import com.hungraim.ism.pojo.entity.role.ChFndAcModule;
 
 public interface ChFndAcModuleMapper extends BaseMapper<ChFndAcModule> {
 }
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/role/ChFndAcModuleUrlBakMapper.java

 package com.hungraim.ism.mapper.role;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.role.ChFndAcModuleUrlBak;
+import com.hungraim.ism.pojo.entity.role.ChFndAcModuleUrlBak;
 
 public interface ChFndAcModuleUrlBakMapper extends BaseMapper<ChFndAcModuleUrlBak> {
 }
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/role/ChFndAcRoleMapper.java

 package com.hungraim.ism.mapper.role;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.role.ChFndAcRole;
+import com.hungraim.ism.pojo.entity.role.ChFndAcRole;
 
 public interface ChFndAcRoleMapper extends BaseMapper<ChFndAcRole> {
 }
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/role/ChFndAcRoleModuleMapper.java

 package com.hungraim.ism.mapper.role;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.role.ChFndAcRoleModule;
+import com.hungraim.ism.pojo.entity.role.ChFndAcRoleModule;
 
 public interface ChFndAcRoleModuleMapper extends BaseMapper<ChFndAcRoleModule> {
 }
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/role/ChFndAcUserRoleMapper.java

 package com.hungraim.ism.mapper.role;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.role.ChFndAcUserRole;
+import com.hungraim.ism.pojo.entity.role.ChFndAcUserRole;
 
 public interface ChFndAcUserRoleMapper extends BaseMapper<ChFndAcUserRole> {
 }
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/role/TppesChRoleMapper.java

 package com.hungraim.ism.mapper.role;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.role.TppesChRole;
+import com.hungraim.ism.pojo.entity.role.TppesChRole;
 
 public interface TppesChRoleMapper extends BaseMapper<TppesChRole> {
 }
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/role/TppesChRoleMenuMapper.java

 package com.hungraim.ism.mapper.role;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.role.TppesChRoleMenu;
+import com.hungraim.ism.pojo.entity.role.TppesChRoleMenu;
 
 public interface TppesChRoleMenuMapper extends BaseMapper<TppesChRoleMenu> {
 }
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/role/TppesChUserRoleMapper.java

 package com.hungraim.ism.mapper.role;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.role.TppesChUserRole;
+import com.hungraim.ism.pojo.entity.role.TppesChUserRole;
 
 public interface TppesChUserRoleMapper extends BaseMapper<TppesChUserRole> {
 }
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/serviceManage/ChCfgAccMapper.java

 package com.hungraim.ism.mapper.serviceManage;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.serviceManage.ChCfgAcc;
+import com.hungraim.ism.pojo.entity.serviceManage.ChCfgAcc;
 
 public interface ChCfgAccMapper extends BaseMapper<ChCfgAcc> {
 }
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/serviceManage/ChSrvProgramMapper.java

 package com.hungraim.ism.mapper.serviceManage;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.serviceManage.ChSrvProgram;
+import com.hungraim.ism.pojo.entity.serviceManage.ChSrvProgram;
 
 public interface ChSrvProgramMapper extends BaseMapper<ChSrvProgram> {
 }
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/serviceManage/ChSrvSendEvaluateMapper.java

 package com.hungraim.ism.mapper.serviceManage;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.serviceManage.ChSrvSendEvaluate;
+import com.hungraim.ism.pojo.entity.serviceManage.ChSrvSendEvaluate;
 
 public interface ChSrvSendEvaluateMapper extends BaseMapper<ChSrvSendEvaluate> {
 }
\ No newline at end of file

common/common-mybatis/src/main/java/com/hungraim/ism/mapper/serviceManage/TppesChh5Picture1Mapper.java

 package com.hungraim.ism.mapper.serviceManage;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.serviceManage.TppesChh5Picture1;
+import com.hungraim.ism.pojo.entity.serviceManage.TppesChh5Picture1;
 
 public interface TppesChh5Picture1Mapper extends BaseMapper<TppesChh5Picture1> {
 }
\ No newline at end of file