架构优化

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/CtLeaveMessageEnum.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.Enums;
+package com.flossom.common.core.enums;
 
 /**
  * 系统设置-key 枚举

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/SystemSettingKeyEnum.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.Enums;
+package com.flossom.common.core.enums;
 
 /**
  * 系统设置-key 枚举

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/CtLeaveMessageMapper.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.mapper;
+package com.flossom.common.core.mapper;
 
 
 import com.flossom.common.core.domain.entity.CtLeaveMessage;

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/IntegralGlobalMapper.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.mapper;
+package com.flossom.common.core.mapper;
 
 
 import com.flossom.common.core.domain.entity.IntegralGlobal;

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysConfigMapper.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.mapper;
+package com.flossom.common.core.mapper;
 
 
 

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysDeptMapper.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.mapper;
+package com.flossom.common.core.mapper;
 
 import com.flossom.common.core.domain.entity.SysDept;
 import org.apache.ibatis.annotations.Param;

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysDictDataMapper.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.mapper;
+package com.flossom.common.core.mapper;
 
 import com.flossom.common.core.domain.entity.SysDictData;
 import org.apache.ibatis.annotations.Param;

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysDictTypeMapper.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.mapper;
+package com.flossom.common.core.mapper;
 
 
 import com.flossom.common.core.domain.entity.SysDictType;

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysFiringInfoMapper.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.mapper;
+package com.flossom.common.core.mapper;
 
 
 

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysLogininforMapper.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.mapper;
+package com.flossom.common.core.mapper;
 
 
 import com.flossom.common.core.domain.entity.SysLogininfor;

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysMenuMapper.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.mapper;
+package com.flossom.common.core.mapper;
 
 import com.flossom.common.core.domain.entity.SysMenu;
 import org.apache.ibatis.annotations.Param;

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysNoticeMapper.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.mapper;
+package com.flossom.common.core.mapper;
 
 
 

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysOperLogMapper.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.mapper;
+package com.flossom.common.core.mapper;
 
 
 import com.flossom.common.core.domain.entity.SysOperLog;

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysPostMapper.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.mapper;
+package com.flossom.common.core.mapper;
 
 
 

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysRegionMapper.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.mapper;
+package com.flossom.common.core.mapper;
 
 import com.flossom.common.core.domain.entity.SysRegion;
 import org.apache.ibatis.annotations.Param;

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysRoleDeptMapper.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.mapper;
+package com.flossom.common.core.mapper;
 
 
 import com.flossom.common.core.domain.entity.SysRoleDept;

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysRoleMapper.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.mapper;
+package com.flossom.common.core.mapper;
 
 import com.flossom.common.core.domain.entity.SysRole;
 

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysRoleMenuMapper.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.mapper;
+package com.flossom.common.core.mapper;
 
 
 

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysUserMapper.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.mapper;
+package com.flossom.common.core.mapper;
 
 import com.flossom.common.core.domain.entity.SysUser;
 import org.apache.ibatis.annotations.Param;

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysUserPostMapper.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.mapper;
+package com.flossom.common.core.mapper;
 
 
 

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SysUserRoleMapper.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.mapper;
+package com.flossom.common.core.mapper;
 
 import com.flossom.common.core.domain.entity.SysUserRole;
 import org.apache.ibatis.annotations.Param;

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxOtherSettingMapper.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.mapper;
+package com.flossom.common.core.mapper;
 
 import com.flossom.common.core.domain.entity.WxOtherSetting;
 

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxParameterSettingMapper.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.mapper;
+package com.flossom.common.core.mapper;
 
 import com.flossom.common.core.domain.entity.WxParameterSetting;
 

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxSystemSettingMapper.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.mapper;
+package com.flossom.common.core.mapper;
 
 
 import com.flossom.common.core.domain.entity.WxSystemSetting;

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserMemberMapper.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.mapper;
+package com.flossom.common.core.mapper;
 
 
 import com.flossom.common.core.domain.entity.WxUserMember;

flossom-common/flossom-common-core/src/main/resources/mapper/CtLeaveMessageMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flossom.hzMapper.mapper.CtLeaveMessageMapper">
+<mapper namespace="com.flossom.common.core.mapper.CtLeaveMessageMapper">
 
     <resultMap type="CtLeaveMessage" id="CtLeaveMessageResult">
         <result property="id"    column="id"    />

flossom-common/flossom-common-core/src/main/resources/mapper/IntegralGlobalMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flossom.hzMapper.mapper.IntegralGlobalMapper">
+<mapper namespace="com.flossom.common.core.mapper.IntegralGlobalMapper">
 
     <resultMap type="IntegralGlobal" id="IntegralGlobalResult">
         <result property="id"    column="id"    />

flossom-common/flossom-common-core/src/main/resources/mapper/SysConfigMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flossom.hzMapper.mapper.SysConfigMapper">
+<mapper namespace="com.flossom.common.core.mapper.SysConfigMapper">
 
     <resultMap type="SysConfig" id="SysConfigResult">
     	<id     property="configId"      column="config_id"      />

flossom-common/flossom-common-core/src/main/resources/mapper/SysDeptMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flossom.hzMapper.mapper.SysDeptMapper">
+<mapper namespace="com.flossom.common.core.mapper.SysDeptMapper">
 
 	<resultMap type="SysDept" id="SysDeptResult">
 		<id     property="deptId"     column="dept_id"     />

flossom-common/flossom-common-core/src/main/resources/mapper/SysDictDataMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flossom.hzMapper.mapper.SysDictDataMapper">
+<mapper namespace="com.flossom.common.core.mapper.SysDictDataMapper">
 
 	<resultMap type="SysDictData" id="SysDictDataResult">
 		<id     property="dictCode"   column="dict_code"   />

flossom-common/flossom-common-core/src/main/resources/mapper/SysDictTypeMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flossom.hzMapper.mapper.SysDictTypeMapper">
+<mapper namespace="com.flossom.common.core.mapper.SysDictTypeMapper">
 
 	<resultMap type="SysDictType" id="SysDictTypeResult">
 		<id     property="dictId"     column="dict_id"     />

flossom-common/flossom-common-core/src/main/resources/mapper/SysFiringInfoMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flossom.hzMapper.mapper.SysFiringInfoMapper">
+<mapper namespace="com.flossom.common.core.mapper.SysFiringInfoMapper">
 
     <resultMap type="SysFiringInfo" id="SysFiringInfoResult">
         <result property="id"    column="id"    />

flossom-common/flossom-common-core/src/main/resources/mapper/SysLogininforMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flossom.hzMapper.mapper.SysLogininforMapper">
+<mapper namespace="com.flossom.common.core.mapper.SysLogininforMapper">
 
 	<resultMap type="SysLogininfor" id="SysLogininforResult">
 		<id     property="infoId"        column="info_id"           />

flossom-common/flossom-common-core/src/main/resources/mapper/SysMenuMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 		PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flossom.hzMapper.mapper.SysMenuMapper">
+<mapper namespace="com.flossom.common.core.mapper.SysMenuMapper">
 
 	<resultMap type="SysMenu" id="SysMenuResult">
 		<id     property="menuId"         column="menu_id"        />

flossom-common/flossom-common-core/src/main/resources/mapper/SysNoticeMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flossom.hzMapper.mapper.SysNoticeMapper">
+<mapper namespace="com.flossom.common.core.mapper.SysNoticeMapper">
 
     <resultMap type="SysNotice" id="SysNoticeResult">
         <result property="noticeId"       column="notice_id"       />

flossom-common/flossom-common-core/src/main/resources/mapper/SysOperLogMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flossom.hzMapper.mapper.SysOperLogMapper">
+<mapper namespace="com.flossom.common.core.mapper.SysOperLogMapper">
 
 	<resultMap type="SysOperLog" id="SysOperLogResult">
 		<id     property="operId"         column="oper_id"        />

flossom-common/flossom-common-core/src/main/resources/mapper/SysPostMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flossom.hzMapper.mapper.SysPostMapper">
+<mapper namespace="com.flossom.common.core.mapper.SysPostMapper">
 
 	<resultMap type="SysPost" id="SysPostResult">
 		<id     property="postId"        column="post_id"       />

flossom-common/flossom-common-core/src/main/resources/mapper/SysRegionMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flossom.hzMapper.mapper.SysRegionMapper">
+<mapper namespace="com.flossom.common.core.mapper.SysRegionMapper">
     
     <resultMap type="SysRegion" id="SysRegionResult">
         <result property="id"    column="id"    />

flossom-common/flossom-common-core/src/main/resources/mapper/SysRoleDeptMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flossom.hzMapper.mapper.SysRoleDeptMapper">
+<mapper namespace="com.flossom.common.core.mapper.SysRoleDeptMapper">
 
 	<resultMap type="SysRoleDept" id="SysRoleDeptResult">
 		<result property="roleId"     column="role_id"      />

flossom-common/flossom-common-core/src/main/resources/mapper/SysRoleMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flossom.hzMapper.mapper.SysRoleMapper">
+<mapper namespace="com.flossom.common.core.mapper.SysRoleMapper">
 
 	<resultMap type="SysRole" id="SysRoleResult">
 		<id     property="roleId"             column="role_id"               />

flossom-common/flossom-common-core/src/main/resources/mapper/SysRoleMenuMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flossom.hzMapper.mapper.SysRoleMenuMapper">
+<mapper namespace="com.flossom.common.core.mapper.SysRoleMenuMapper">
 
 	<resultMap type="SysRoleMenu" id="SysRoleMenuResult">
 		<result property="roleId"     column="role_id"      />

flossom-common/flossom-common-core/src/main/resources/mapper/SysUserMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flossom.hzMapper.mapper.SysUserMapper">
+<mapper namespace="com.flossom.common.core.mapper.SysUserMapper">
 
     <resultMap type="SysUser" id="SysUserResult">
         <id     property="userId"       column="user_id"      />

flossom-common/flossom-common-core/src/main/resources/mapper/SysUserPostMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flossom.hzMapper.mapper.SysUserPostMapper">
+<mapper namespace="com.flossom.common.core.mapper.SysUserPostMapper">
 
 	<resultMap type="SysUserPost" id="SysUserPostResult">
 		<result property="userId"     column="user_id"      />

flossom-common/flossom-common-core/src/main/resources/mapper/SysUserRoleMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flossom.hzMapper.mapper.SysUserRoleMapper">
+<mapper namespace="com.flossom.common.core.mapper.SysUserRoleMapper">
 
 	<resultMap type="SysUserRole" id="SysUserRoleResult">
 		<result property="userId"     column="user_id"      />

flossom-common/flossom-common-core/src/main/resources/mapper/WxOtherSettingMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flossom.hzMapper.mapper.WxOtherSettingMapper">
+<mapper namespace="com.flossom.common.core.mapper.WxOtherSettingMapper">
     
     <resultMap type="WxOtherSetting" id="WxOtherSettingResult">
         <result property="id"    column="id"    />

flossom-common/flossom-common-core/src/main/resources/mapper/WxParameterSettingMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flossom.hzMapper.mapper.WxParameterSettingMapper">
+<mapper namespace="com.flossom.common.core.mapper.WxParameterSettingMapper">
     
     <resultMap type="WxParameterSetting" id="WxParameterSettingResult">
         <result property="id"    column="id"    />

flossom-common/flossom-common-core/src/main/resources/mapper/WxSystemSettingMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flossom.hzMapper.mapper.WxSystemSettingMapper">
+<mapper namespace="com.flossom.common.core.mapper.WxSystemSettingMapper">
     
     <resultMap type="WxSystemSetting" id="WxSystemSettingResult">
         <result property="id"    column="id"    />

flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flossom.hzMapper.mapper.WxUserMemberMapper">
+<mapper namespace="com.flossom.common.core.mapper.WxUserMemberMapper">
     
     <resultMap type="WxUserMember" id="WxUserMemberResult">
         <result property="id"    column="id"    />

flossom-common/flossom-common-hzMapper/pom.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.flossom</groupId>
-        <artifactId>flossom-common</artifactId>
-        <version>3.6.3</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>flossom-common-hzMapper</artifactId>
-
-    <description>
-        flossom-common-mapper接口
-    </description>
-
-	<dependencies>
-        <dependency>
-            <groupId>com.flossom</groupId>
-            <artifactId>flossom-common-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.flossom</groupId>
-            <artifactId>flossom-api-system</artifactId>
-        </dependency>
-
-    </dependencies>
-</project>

flossom-common/pom.xml

@@ -14,7 +14,6 @@
         <module>flossom-common-redis</module>
         <module>flossom-common-seata</module>
         <module>flossom-common-swagger</module>
-        <module>flossom-common-hzMapper</module>
         <module>flossom-common-security</module>
         <module>flossom-common-datascope</module>
         <module>flossom-common-datasource</module>

flossom-modules/flossom-mini-program/pom.xml

@@ -84,12 +84,6 @@
             <artifactId>flossom-api-system</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.flossom</groupId>
-            <artifactId>flossom-common-hzMapper</artifactId>
-            <version>3.6.3</version>
-        </dependency>
-
         <!-- httpClient -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/CtleaveMessageServiceImpl.java

@@ -1,8 +1,8 @@
 package com.flossom.miniProgram.service.impl;
 
 import com.flossom.common.core.domain.entity.CtLeaveMessage;
-import com.flossom.hzMapper.Enums.CtLeaveMessageEnum;
-import com.flossom.hzMapper.mapper.CtLeaveMessageMapper;
+import com.flossom.common.core.enums.CtLeaveMessageEnum;
+import com.flossom.common.core.mapper.CtLeaveMessageMapper;
 import com.flossom.miniProgram.service.ICtleaveMeassageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SysFiringInfoServiceImpl.java

@@ -1,7 +1,7 @@
 package com.flossom.miniProgram.service.impl;
 
 import com.flossom.common.core.domain.SysFiringInfo;
-import com.flossom.hzMapper.mapper.SysFiringInfoMapper;
+import com.flossom.common.core.mapper.SysFiringInfoMapper;
 import com.flossom.miniProgram.service.ISysFiringInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SysRegionServiceImpl.java

@@ -1,7 +1,7 @@
 package com.flossom.miniProgram.service.impl;
 
 import com.flossom.common.core.domain.entity.SysRegion;
-import com.flossom.hzMapper.mapper.SysRegionMapper;
+import com.flossom.common.core.mapper.SysRegionMapper;
 import com.flossom.miniProgram.service.ISysRegionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SystemSettingServiceImpl.java

@@ -2,9 +2,9 @@ package com.flossom.miniProgram.service.impl;
 
 import com.flossom.common.core.domain.entity.WxOtherSetting;
 import com.flossom.common.core.domain.entity.WxSystemSetting;
-import com.flossom.hzMapper.Enums.SystemSettingKeyEnum;
-import com.flossom.hzMapper.mapper.WxOtherSettingMapper;
-import com.flossom.hzMapper.mapper.WxSystemSettingMapper;
+import com.flossom.common.core.enums.SystemSettingKeyEnum;
+import com.flossom.common.core.mapper.WxOtherSettingMapper;
+import com.flossom.common.core.mapper.WxSystemSettingMapper;
 import com.flossom.miniProgram.service.ISystemSettingService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java

@@ -9,11 +9,11 @@ import com.flossom.common.core.domain.R;
 import com.flossom.common.core.domain.RegisterBody;
 import com.flossom.common.core.domain.entity.WxUserMember;
 import com.flossom.common.core.exception.ServiceException;
+import com.flossom.common.core.mapper.WxUserMemberMapper;
 import com.flossom.common.core.utils.DateUtils;
 import com.flossom.common.core.web.domain.AjaxResult;
 import com.flossom.common.redis.service.RedisService;
 import com.flossom.common.security.utils.SecurityUtils;
-import com.flossom.hzMapper.mapper.WxUserMemberMapper;
 import com.flossom.miniProgram.domain.vo.LoginUserVo;
 import com.flossom.miniProgram.domain.vo.UserMemberUpdateVo;
 import com.flossom.miniProgram.domain.vo.WxCode2PhoneRet;

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/MiniProgramUtils.java

@@ -1,14 +1,12 @@
 package com.flossom.miniProgram.utils;
 
 import com.flossom.common.core.domain.entity.WxParameterSetting;
-import com.flossom.hzMapper.mapper.WxParameterSettingMapper;
+import com.flossom.common.core.mapper.WxParameterSettingMapper;
 import com.flossom.miniProgram.config.properties.WxConfig;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**

flossom-modules/flossom-system/pom.xml

@@ -77,12 +77,6 @@
             <groupId>com.flossom</groupId>
             <artifactId>flossom-common-swagger</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>com.flossom</groupId>
-            <artifactId>flossom-common-hzMapper</artifactId>
-            <version>3.6.3</version>
-        </dependency>
     </dependencies>
 
     <build>

flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/CtLeaveMessageServiceImpl.java

@@ -3,8 +3,8 @@ package com.flossom.system.service.impl;
 import java.util.List;
 
 import com.flossom.common.core.domain.entity.CtLeaveMessage;
+import com.flossom.common.core.mapper.CtLeaveMessageMapper;
 import com.flossom.common.core.utils.DateUtils;
-import com.flossom.hzMapper.mapper.CtLeaveMessageMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.flossom.system.service.ICtLeaveMessageService;

flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/IntegralGlobalServiceImpl.java

@@ -3,9 +3,9 @@ package com.flossom.system.service.impl;
 import java.util.List;
 
 import com.flossom.common.core.domain.entity.IntegralGlobal;
+import com.flossom.common.core.mapper.IntegralGlobalMapper;
 import com.flossom.common.core.utils.DateUtils;
 import com.flossom.common.security.utils.SecurityUtils;
-import com.flossom.hzMapper.mapper.IntegralGlobalMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.flossom.system.service.IIntegralGlobalService;

flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysConfigServiceImpl.java

@@ -5,7 +5,7 @@ import java.util.List;
 import javax.annotation.PostConstruct;
 
 import com.flossom.common.core.domain.entity.SysConfig;
-import com.flossom.hzMapper.mapper.SysConfigMapper;
+import com.flossom.common.core.mapper.SysConfigMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.flossom.common.core.constant.CacheConstants;

flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysDeptServiceImpl.java

@@ -9,8 +9,8 @@ import com.flossom.common.core.domain.entity.SysDept;
 import com.flossom.common.core.domain.entity.SysRole;
 import com.flossom.common.core.domain.entity.SysUser;
 import com.flossom.common.core.domain.vo.TreeSelect;
-import com.flossom.hzMapper.mapper.SysDeptMapper;
-import com.flossom.hzMapper.mapper.SysRoleMapper;
+import com.flossom.common.core.mapper.SysDeptMapper;
+import com.flossom.common.core.mapper.SysRoleMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.flossom.common.core.constant.UserConstants;

flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysDictDataServiceImpl.java

@@ -3,7 +3,7 @@ package com.flossom.system.service.impl;
 import java.util.List;
 
 import com.flossom.common.core.domain.entity.SysDictData;
-import com.flossom.hzMapper.mapper.SysDictDataMapper;
+import com.flossom.common.core.mapper.SysDictDataMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.flossom.common.security.utils.DictUtils;

flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysDictTypeServiceImpl.java

@@ -8,8 +8,8 @@ import javax.annotation.PostConstruct;
 
 import com.flossom.common.core.domain.entity.SysDictData;
 import com.flossom.common.core.domain.entity.SysDictType;
-import com.flossom.hzMapper.mapper.SysDictDataMapper;
-import com.flossom.hzMapper.mapper.SysDictTypeMapper;
+import com.flossom.common.core.mapper.SysDictDataMapper;
+import com.flossom.common.core.mapper.SysDictTypeMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysFiringInfoServiceImpl.java

@@ -3,9 +3,9 @@ package com.flossom.system.service.impl;
 import java.util.List;
 
 import com.flossom.common.core.domain.SysFiringInfo;
+import com.flossom.common.core.mapper.SysFiringInfoMapper;
 import com.flossom.common.core.utils.DateUtils;
 import com.flossom.common.security.utils.SecurityUtils;
-import com.flossom.hzMapper.mapper.SysFiringInfoMapper;
 import com.flossom.system.api.model.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysLogininforServiceImpl.java

@@ -3,7 +3,7 @@ package com.flossom.system.service.impl;
 import java.util.List;
 
 import com.flossom.common.core.domain.entity.SysLogininfor;
-import com.flossom.hzMapper.mapper.SysLogininforMapper;
+import com.flossom.common.core.mapper.SysLogininforMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.flossom.system.service.ISysLogininforService;

flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysMenuServiceImpl.java

@@ -15,9 +15,9 @@ import com.flossom.common.core.domain.entity.SysUser;
 import com.flossom.common.core.domain.vo.MetaVo;
 import com.flossom.common.core.domain.vo.RouterVo;
 import com.flossom.common.core.domain.vo.TreeSelect;
-import com.flossom.hzMapper.mapper.SysMenuMapper;
-import com.flossom.hzMapper.mapper.SysRoleMapper;
-import com.flossom.hzMapper.mapper.SysRoleMenuMapper;
+import com.flossom.common.core.mapper.SysMenuMapper;
+import com.flossom.common.core.mapper.SysRoleMapper;
+import com.flossom.common.core.mapper.SysRoleMenuMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.flossom.common.core.constant.Constants;

flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysNoticeServiceImpl.java

@@ -3,7 +3,7 @@ package com.flossom.system.service.impl;
 import java.util.List;
 
 import com.flossom.common.core.domain.entity.SysNotice;
-import com.flossom.hzMapper.mapper.SysNoticeMapper;
+import com.flossom.common.core.mapper.SysNoticeMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.flossom.system.service.ISysNoticeService;

flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysOperLogServiceImpl.java

@@ -3,7 +3,7 @@ package com.flossom.system.service.impl;
 import java.util.List;
 
 import com.flossom.common.core.domain.entity.SysOperLog;
-import com.flossom.hzMapper.mapper.SysOperLogMapper;
+import com.flossom.common.core.mapper.SysOperLogMapper;
 import com.flossom.system.service.ISysOperLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysPostServiceImpl.java

@@ -3,8 +3,8 @@ package com.flossom.system.service.impl;
 import java.util.List;
 
 import com.flossom.common.core.domain.entity.SysPost;
-import com.flossom.hzMapper.mapper.SysPostMapper;
-import com.flossom.hzMapper.mapper.SysUserPostMapper;
+import com.flossom.common.core.mapper.SysPostMapper;
+import com.flossom.common.core.mapper.SysUserPostMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.flossom.common.core.constant.UserConstants;

flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysRegionServiceImpl.java

@@ -3,7 +3,7 @@ package com.flossom.system.service.impl;
 import java.util.List;
 
 import com.flossom.common.core.domain.entity.SysRegion;
-import com.flossom.hzMapper.mapper.SysRegionMapper;
+import com.flossom.common.core.mapper.SysRegionMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.flossom.system.service.ISysRegionService;

flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysRoleServiceImpl.java

@@ -7,10 +7,10 @@ import java.util.List;
 import java.util.Set;
 
 import com.flossom.common.core.domain.entity.*;
-import com.flossom.hzMapper.mapper.SysRoleDeptMapper;
-import com.flossom.hzMapper.mapper.SysRoleMapper;
-import com.flossom.hzMapper.mapper.SysRoleMenuMapper;
-import com.flossom.hzMapper.mapper.SysUserRoleMapper;
+import com.flossom.common.core.mapper.SysRoleDeptMapper;
+import com.flossom.common.core.mapper.SysRoleMapper;
+import com.flossom.common.core.mapper.SysRoleMenuMapper;
+import com.flossom.common.core.mapper.SysUserRoleMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysUserServiceImpl.java

@@ -6,7 +6,7 @@ import java.util.stream.Collectors;
 import javax.validation.Validator;
 
 import com.flossom.common.core.domain.entity.*;
-import com.flossom.hzMapper.mapper.*;
+import com.flossom.common.core.mapper.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxOtherSettingServiceImpl.java

@@ -3,8 +3,8 @@ package com.flossom.system.service.impl;
 import java.util.List;
 
 import com.flossom.common.core.domain.entity.WxOtherSetting;
+import com.flossom.common.core.mapper.WxOtherSettingMapper;
 import com.flossom.common.core.utils.DateUtils;
-import com.flossom.hzMapper.mapper.WxOtherSettingMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.flossom.system.service.IWxOtherSettingService;

flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxParameterSettingServiceImpl.java

@@ -3,8 +3,8 @@ package com.flossom.system.service.impl;
 import java.util.List;
 
 import com.flossom.common.core.domain.entity.WxParameterSetting;
+import com.flossom.common.core.mapper.WxParameterSettingMapper;
 import com.flossom.common.core.utils.DateUtils;
-import com.flossom.hzMapper.mapper.WxParameterSettingMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.flossom.system.service.IWxParameterSettingService;

flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxSystemSettingServiceImpl.java

@@ -3,8 +3,8 @@ package com.flossom.system.service.impl;
 import java.util.List;
 
 import com.flossom.common.core.domain.entity.WxSystemSetting;
+import com.flossom.common.core.mapper.WxSystemSettingMapper;
 import com.flossom.common.core.utils.DateUtils;
-import com.flossom.hzMapper.mapper.WxSystemSettingMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.flossom.system.service.IWxSystemSettingService;

flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java

@@ -3,8 +3,8 @@ package com.flossom.system.service.impl;
 import java.util.List;
 
 import com.flossom.common.core.domain.entity.WxUserMember;
+import com.flossom.common.core.mapper.WxUserMemberMapper;
 import com.flossom.common.core.utils.DateUtils;
-import com.flossom.hzMapper.mapper.WxUserMemberMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.flossom.system.service.IWxUserMemberService;