From 01feda9300eb40de454e6210c032063ffcf4dca5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?=
 <852955+jishenghua@users.noreply.gitee.com>
Date: Sun, 24 Feb 2019 17:01:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0Mapper=E7=9A=84=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=BB=93=E6=9E=84=EF=BC=88=E4=BC=98=E5=8C=96=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper_xml/AccountHeadMapperEx.xml      | 4 ++--
 src/main/resources/mapper_xml/AccountItemMapperEx.xml      | 6 +++---
 src/main/resources/mapper_xml/AccountMapperEx.xml          | 4 ++--
 src/main/resources/mapper_xml/AppMapperEx.xml              | 4 ++--
 src/main/resources/mapper_xml/DepotMapperEx.xml            | 4 ++--
 src/main/resources/mapper_xml/FunctionsMapperEx.xml        | 4 ++--
 src/main/resources/mapper_xml/InOutItemMapperEx.xml        | 4 ++--
 src/main/resources/mapper_xml/LogMapperEx.xml              | 4 ++--
 src/main/resources/mapper_xml/MaterialPropertyMapperEx.xml | 4 ++--
 src/main/resources/mapper_xml/PersonMapperEx.xml           | 4 ++--
 src/main/resources/mapper_xml/RoleMapperEx.xml             | 4 ++--
 src/main/resources/mapper_xml/SupplierMapperEx.xml         | 6 +++---
 src/main/resources/mapper_xml/SystemConfigMapperEx.xml     | 4 ++--
 src/main/resources/mapper_xml/UnitMapperEx.xml             | 4 ++--
 src/main/resources/mapper_xml/UserMapperEx.xml             | 4 ++--
 15 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/main/resources/mapper_xml/AccountHeadMapperEx.xml b/src/main/resources/mapper_xml/AccountHeadMapperEx.xml
index 574733f9..94d6882c 100644
--- a/src/main/resources/mapper_xml/AccountHeadMapperEx.xml
+++ b/src/main/resources/mapper_xml/AccountHeadMapperEx.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jsh.erp.datasource.mappers.AccountHeadMapper">
+<mapper namespace="com.jsh.erp.datasource.mappers.AccountHeadMapperEx">
 
-    <resultMap extends="BaseResultMap" id="ResultMapEx" type="com.jsh.erp.datasource.entities.AccountHeadVo4ListEx">
+    <resultMap extends="com.jsh.erp.datasource.mappers.AccountHeadMapper.BaseResultMap" id="ResultMapEx" type="com.jsh.erp.datasource.entities.AccountHeadVo4ListEx">
         <result column="OrganName" jdbcType="VARCHAR" property="organname" />
         <result column="HandsPersonName" jdbcType="VARCHAR" property="handspersonname" />
         <result column="AccountName" jdbcType="VARCHAR" property="accountname" />
diff --git a/src/main/resources/mapper_xml/AccountItemMapperEx.xml b/src/main/resources/mapper_xml/AccountItemMapperEx.xml
index fe26140c..04d709ca 100644
--- a/src/main/resources/mapper_xml/AccountItemMapperEx.xml
+++ b/src/main/resources/mapper_xml/AccountItemMapperEx.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jsh.erp.datasource.mappers.AccountItemMapper">
+<mapper namespace="com.jsh.erp.datasource.mappers.AccountItemMapperEx">
 
-    <resultMap extends="BaseResultMap" id="ResultWithInfoExMap" type="com.jsh.erp.datasource.vo.AccountItemVo4List">
+    <resultMap extends="com.jsh.erp.datasource.mappers.AccountItemMapper.BaseResultMap" id="ResultWithInfoExMap" type="com.jsh.erp.datasource.vo.AccountItemVo4List">
         <result column="AccountName" jdbcType="VARCHAR" property="accountName" />
         <result column="InOutItemName" jdbcType="VARCHAR" property="inOutItemName" />
     </resultMap>
 
-    <select id="selectByConditionAccountItem" parameterType="com.jsh.erp.datasource.entities.AccountItemExample" resultMap="BaseResultMap">
+    <select id="selectByConditionAccountItem" parameterType="com.jsh.erp.datasource.entities.AccountItemExample" resultMap="com.jsh.erp.datasource.mappers.AccountItemMapper.BaseResultMap">
         select *
         FROM jsh_accountitem
         where 1=1
diff --git a/src/main/resources/mapper_xml/AccountMapperEx.xml b/src/main/resources/mapper_xml/AccountMapperEx.xml
index ec3880f4..e548785b 100644
--- a/src/main/resources/mapper_xml/AccountMapperEx.xml
+++ b/src/main/resources/mapper_xml/AccountMapperEx.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jsh.erp.datasource.mappers.AccountMapper">
-    <resultMap extends="BaseResultMap" id="ResultListMap" type="com.jsh.erp.datasource.vo.AccountVo4List">
+<mapper namespace="com.jsh.erp.datasource.mappers.AccountMapperEx">
+    <resultMap extends="com.jsh.erp.datasource.mappers.AccountMapper.BaseResultMap" id="ResultListMap" type="com.jsh.erp.datasource.vo.AccountVo4List">
         <result column="thismonthamount" jdbcType="VARCHAR" property="thismonthamount" />
     </resultMap>
 
diff --git a/src/main/resources/mapper_xml/AppMapperEx.xml b/src/main/resources/mapper_xml/AppMapperEx.xml
index e82006c5..d8c0f4a1 100644
--- a/src/main/resources/mapper_xml/AppMapperEx.xml
+++ b/src/main/resources/mapper_xml/AppMapperEx.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jsh.erp.datasource.mappers.AppMapper">
-    <select id="selectByConditionApp" parameterType="com.jsh.erp.datasource.entities.AppExample" resultMap="BaseResultMap">
+<mapper namespace="com.jsh.erp.datasource.mappers.AppMapperEx">
+    <select id="selectByConditionApp" parameterType="com.jsh.erp.datasource.entities.AppExample" resultMap="com.jsh.erp.datasource.mappers.AppMapper.BaseResultMap">
         select *
         FROM jsh_app
         where 1=1
diff --git a/src/main/resources/mapper_xml/DepotMapperEx.xml b/src/main/resources/mapper_xml/DepotMapperEx.xml
index 72a385a6..cf777651 100644
--- a/src/main/resources/mapper_xml/DepotMapperEx.xml
+++ b/src/main/resources/mapper_xml/DepotMapperEx.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jsh.erp.datasource.mappers.DepotMapper">
-    <select id="selectByConditionDepot" parameterType="com.jsh.erp.datasource.entities.DepotExample" resultMap="BaseResultMap">
+<mapper namespace="com.jsh.erp.datasource.mappers.DepotMapperEx">
+    <select id="selectByConditionDepot" parameterType="com.jsh.erp.datasource.entities.DepotExample" resultMap="com.jsh.erp.datasource.mappers.DepotMapper.BaseResultMap">
         select *
         FROM jsh_depot
         where 1=1
diff --git a/src/main/resources/mapper_xml/FunctionsMapperEx.xml b/src/main/resources/mapper_xml/FunctionsMapperEx.xml
index 6a52586d..4f3bf26f 100644
--- a/src/main/resources/mapper_xml/FunctionsMapperEx.xml
+++ b/src/main/resources/mapper_xml/FunctionsMapperEx.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jsh.erp.datasource.mappers.FunctionsMapper">
-    <select id="selectByConditionFunctions" parameterType="com.jsh.erp.datasource.entities.FunctionsExample" resultMap="BaseResultMap">
+<mapper namespace="com.jsh.erp.datasource.mappers.FunctionsMapperEx">
+    <select id="selectByConditionFunctions" parameterType="com.jsh.erp.datasource.entities.FunctionsExample" resultMap="com.jsh.erp.datasource.mappers.FunctionsMapper.BaseResultMap">
         select *
         FROM jsh_functions
         where 1=1
diff --git a/src/main/resources/mapper_xml/InOutItemMapperEx.xml b/src/main/resources/mapper_xml/InOutItemMapperEx.xml
index effc54b2..fce9e716 100644
--- a/src/main/resources/mapper_xml/InOutItemMapperEx.xml
+++ b/src/main/resources/mapper_xml/InOutItemMapperEx.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jsh.erp.datasource.mappers.InOutItemMapper">
-    <select id="selectByConditionInOutItem" parameterType="com.jsh.erp.datasource.entities.InOutItemExample" resultMap="BaseResultMap">
+<mapper namespace="com.jsh.erp.datasource.mappers.InOutItemMapperEx">
+    <select id="selectByConditionInOutItem" parameterType="com.jsh.erp.datasource.entities.InOutItemExample" resultMap="com.jsh.erp.datasource.mappers.InOutItemMapper.BaseResultMap">
         select *
         FROM jsh_inoutitem
         where 1=1
diff --git a/src/main/resources/mapper_xml/LogMapperEx.xml b/src/main/resources/mapper_xml/LogMapperEx.xml
index 12602381..fc34a6ef 100644
--- a/src/main/resources/mapper_xml/LogMapperEx.xml
+++ b/src/main/resources/mapper_xml/LogMapperEx.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jsh.erp.datasource.mappers.LogMapper">
-    <resultMap extends="BaseResultMap" id="ResultExMap" type="com.jsh.erp.datasource.vo.LogVo4List">
+<mapper namespace="com.jsh.erp.datasource.mappers.LogMapperEx">
+    <resultMap extends="com.jsh.erp.datasource.mappers.LogMapper.BaseResultMap" id="ResultExMap" type="com.jsh.erp.datasource.vo.LogVo4List">
         <result column="userName" jdbcType="VARCHAR" property="username" />
     </resultMap>
 
diff --git a/src/main/resources/mapper_xml/MaterialPropertyMapperEx.xml b/src/main/resources/mapper_xml/MaterialPropertyMapperEx.xml
index 0cde7348..7139ca8c 100644
--- a/src/main/resources/mapper_xml/MaterialPropertyMapperEx.xml
+++ b/src/main/resources/mapper_xml/MaterialPropertyMapperEx.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jsh.erp.datasource.mappers.MaterialPropertyMapper">
-    <select id="selectByConditionMaterialProperty" parameterType="com.jsh.erp.datasource.entities.MaterialPropertyExample" resultMap="BaseResultMap">
+<mapper namespace="com.jsh.erp.datasource.mappers.MaterialPropertyMapperEx">
+    <select id="selectByConditionMaterialProperty" parameterType="com.jsh.erp.datasource.entities.MaterialPropertyExample" resultMap="com.jsh.erp.datasource.mappers.MaterialPropertyMapper.BaseResultMap">
         select *
         FROM jsh_materialproperty
         where 1=1
diff --git a/src/main/resources/mapper_xml/PersonMapperEx.xml b/src/main/resources/mapper_xml/PersonMapperEx.xml
index 86b8b4a4..f42b6c1d 100644
--- a/src/main/resources/mapper_xml/PersonMapperEx.xml
+++ b/src/main/resources/mapper_xml/PersonMapperEx.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jsh.erp.datasource.mappers.PersonMapper">
-    <select id="selectByConditionPerson" parameterType="com.jsh.erp.datasource.entities.PersonExample" resultMap="BaseResultMap">
+<mapper namespace="com.jsh.erp.datasource.mappers.PersonMapperEx">
+    <select id="selectByConditionPerson" parameterType="com.jsh.erp.datasource.entities.PersonExample" resultMap="com.jsh.erp.datasource.mappers.PersonMapper.BaseResultMap">
         select *
         FROM jsh_person
         where 1=1
diff --git a/src/main/resources/mapper_xml/RoleMapperEx.xml b/src/main/resources/mapper_xml/RoleMapperEx.xml
index 343b3d4b..ad068332 100644
--- a/src/main/resources/mapper_xml/RoleMapperEx.xml
+++ b/src/main/resources/mapper_xml/RoleMapperEx.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jsh.erp.datasource.mappers.RoleMapper">
-    <select id="selectByConditionRole" resultMap="BaseResultMap">
+<mapper namespace="com.jsh.erp.datasource.mappers.RoleMapperEx">
+    <select id="selectByConditionRole" resultMap="com.jsh.erp.datasource.mappers.RoleMapper.BaseResultMap">
         SELECT *
         FROM jsh_role
         WHERE 1=1
diff --git a/src/main/resources/mapper_xml/SupplierMapperEx.xml b/src/main/resources/mapper_xml/SupplierMapperEx.xml
index d18af528..4ba5ed5b 100644
--- a/src/main/resources/mapper_xml/SupplierMapperEx.xml
+++ b/src/main/resources/mapper_xml/SupplierMapperEx.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jsh.erp.datasource.mappers.SupplierMapper">
-    <select id="selectByConditionSupplier" parameterType="com.jsh.erp.datasource.entities.SupplierExample" resultMap="BaseResultMap">
+<mapper namespace="com.jsh.erp.datasource.mappers.SupplierMapperEx">
+    <select id="selectByConditionSupplier" parameterType="com.jsh.erp.datasource.entities.SupplierExample" resultMap="com.jsh.erp.datasource.mappers.SupplierMapper.BaseResultMap">
         select *
         FROM jsh_supplier
         where 1=1
@@ -46,7 +46,7 @@
         </if>
     </select>
 
-    <select id="findByAll" parameterType="com.jsh.erp.datasource.entities.SupplierExample" resultMap="BaseResultMap">
+    <select id="findByAll" parameterType="com.jsh.erp.datasource.entities.SupplierExample" resultMap="com.jsh.erp.datasource.mappers.SupplierMapper.BaseResultMap">
         select *
         FROM jsh_supplier
         where 1=1
diff --git a/src/main/resources/mapper_xml/SystemConfigMapperEx.xml b/src/main/resources/mapper_xml/SystemConfigMapperEx.xml
index fb930632..6f782e76 100644
--- a/src/main/resources/mapper_xml/SystemConfigMapperEx.xml
+++ b/src/main/resources/mapper_xml/SystemConfigMapperEx.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jsh.erp.datasource.mappers.SystemConfigMapper">
-    <select id="selectByConditionSystemConfig" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample" resultMap="BaseResultMap">
+<mapper namespace="com.jsh.erp.datasource.mappers.SystemConfigMapperEx">
+    <select id="selectByConditionSystemConfig" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample" resultMap="com.jsh.erp.datasource.mappers.SystemConfigMapper.BaseResultMap">
         select *
         FROM jsh_systemconfig
         where 1=1
diff --git a/src/main/resources/mapper_xml/UnitMapperEx.xml b/src/main/resources/mapper_xml/UnitMapperEx.xml
index c96d50ae..08c0edfd 100644
--- a/src/main/resources/mapper_xml/UnitMapperEx.xml
+++ b/src/main/resources/mapper_xml/UnitMapperEx.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jsh.erp.datasource.mappers.UnitMapper">
-    <select id="selectByConditionUnit" parameterType="com.jsh.erp.datasource.entities.UnitExample" resultMap="BaseResultMap">
+<mapper namespace="com.jsh.erp.datasource.mappers.UnitMapperEx">
+    <select id="selectByConditionUnit" parameterType="com.jsh.erp.datasource.entities.UnitExample" resultMap="com.jsh.erp.datasource.mappers.UnitMapper.BaseResultMap">
         select *
         FROM jsh_unit
         where 1=1
diff --git a/src/main/resources/mapper_xml/UserMapperEx.xml b/src/main/resources/mapper_xml/UserMapperEx.xml
index 5f005bf6..f29cb454 100644
--- a/src/main/resources/mapper_xml/UserMapperEx.xml
+++ b/src/main/resources/mapper_xml/UserMapperEx.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jsh.erp.datasource.mappers.UserMapper">
-    <select id="selectByConditionUser" parameterType="com.jsh.erp.datasource.entities.UserExample" resultMap="BaseResultMap">
+<mapper namespace="com.jsh.erp.datasource.mappers.UserMapperEx">
+    <select id="selectByConditionUser" parameterType="com.jsh.erp.datasource.entities.UserExample" resultMap="com.jsh.erp.datasource.mappers.UserMapper.BaseResultMap">
         select *
         FROM jsh_user
         where 1=1