diff --git a/pom.xml b/pom.xml
index 18f4e423..3867dc32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,7 +161,7 @@
 			<plugin>
 				<groupId>org.mybatis.generator</groupId>
 				<artifactId>mybatis-generator-maven-plugin</artifactId>
-				<version>1.3.2</version>
+				<version>1.4.0</version>
 				<configuration>
 					<configurationFile>${basedir}/src/test/resources/generatorConfig.xml</configurationFile>
 					<verbose>true</verbose>
diff --git a/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java b/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java
index 18eac650..83ac7bf9 100644
--- a/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java
+++ b/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java
@@ -13,7 +13,7 @@ public class DepotHeadExample {
     protected List<Criteria> oredCriteria;
 
     public DepotHeadExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -70,7 +70,7 @@ public class DepotHeadExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -2118,7 +2118,6 @@ public class DepotHeadExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }
diff --git a/src/main/java/com/jsh/erp/datasource/entities/UserExample.java b/src/main/java/com/jsh/erp/datasource/entities/UserExample.java
index 36f35c05..a9cf2c0b 100644
--- a/src/main/java/com/jsh/erp/datasource/entities/UserExample.java
+++ b/src/main/java/com/jsh/erp/datasource/entities/UserExample.java
@@ -11,7 +11,7 @@ public class UserExample {
     protected List<Criteria> oredCriteria;
 
     public UserExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -68,7 +68,7 @@ public class UserExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -1036,7 +1036,6 @@ public class UserExample {
     }
 
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }
diff --git a/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java
index 88b65337..15201e88 100644
--- a/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java
+++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java
@@ -6,7 +6,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 public interface DepotHeadMapper {
-    int countByExample(DepotHeadExample example);
+    long countByExample(DepotHeadExample example);
 
     int deleteByExample(DepotHeadExample example);
 
diff --git a/src/main/java/com/jsh/erp/datasource/mappers/UserMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/UserMapper.java
index 6f0a8510..a5aef02a 100644
--- a/src/main/java/com/jsh/erp/datasource/mappers/UserMapper.java
+++ b/src/main/java/com/jsh/erp/datasource/mappers/UserMapper.java
@@ -6,7 +6,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 public interface UserMapper {
-    int countByExample(UserExample example);
+    long countByExample(UserExample example);
 
     int deleteByExample(UserExample example);
 
diff --git a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
index 9fcad5d3..e5fb636b 100644
--- a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
+++ b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
@@ -464,8 +464,6 @@ public class DepotHeadService {
     }
 
     /**
-     * create by: cjl
-     * description:
      *  新增单据主表及单据子表信息
      * create time: 2019/1/25 14:36
      * @Param: beanJson
@@ -493,15 +491,21 @@ public class DepotHeadService {
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
-
         /**入库和出库处理预付款信息*/
         if(BusinessConstants.PAY_TYPE_PREPAID.equals(depotHead.getPaytype())){
             if(depotHead.getOrganid()!=null) {
                 supplierService.updateAdvanceIn(depotHead.getOrganid(), BigDecimal.ZERO.subtract(depotHead.getTotalprice()));
             }
         }
-        /**入库和出库处理单据子表信息*/
-        depotItemService.saveDetials(inserted,deleted,updated,depotHead.getId(),tenantId, request);
+        //根据单据编号查询单据id
+        DepotHeadExample dhExample = new DepotHeadExample();
+        dhExample.createCriteria().andDefaultnumberEqualTo(depotHead.getDefaultnumber()).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
+        List<DepotHead> list = depotHeadMapper.selectByExample(dhExample);
+        if(list!=null) {
+            Long headId = list.get(0).getId();
+            /**入库和出库处理单据子表信息*/
+            depotItemService.saveDetials(inserted,deleted,updated,headId,tenantId, request);
+        }
         /**如果关联单据号非空则更新订单的状态为2 */
         if(depotHead.getLinknumber()!=null) {
             DepotHead depotHeadOrders = new DepotHead();
@@ -516,8 +520,6 @@ public class DepotHeadService {
         }
     }
     /**
-     * create by: cjl
-     * description:
      * 更新单据主表及单据子表信息
      * create time: 2019/1/28 14:47
      * @Param: id
diff --git a/src/main/java/com/jsh/erp/service/user/UserService.java b/src/main/java/com/jsh/erp/service/user/UserService.java
index 4d7f20dc..dddef5c9 100644
--- a/src/main/java/com/jsh/erp/service/user/UserService.java
+++ b/src/main/java/com/jsh/erp/service/user/UserService.java
@@ -334,8 +334,14 @@ public class UserService {
             OrgaUserRel oul=new OrgaUserRel();
             //机构id
             oul.setOrgaId(ue.getOrgaId());
-            //用户id
-            oul.setUserId(ue.getId());
+            //用户id，根据用户名查询id
+            UserExample example = new UserExample();
+            example.createCriteria().andLoginameEqualTo(ue.getLoginame());
+            List<User> list = userMapper.selectByExample(example);
+            if(list!=null) {
+                Long userId = list.get(0).getId();
+                oul.setUserId(userId);
+            }
             //用户在机构中的排序
             oul.setUserBlngOrgaDsplSeq(ue.getUserBlngOrgaDsplSeq());
 
diff --git a/src/main/resources/mapper_xml/DepotHeadMapper.xml b/src/main/resources/mapper_xml/DepotHeadMapper.xml
index 71e7ba82..55d79306 100644
--- a/src/main/resources/mapper_xml/DepotHeadMapper.xml
+++ b/src/main/resources/mapper_xml/DepotHeadMapper.xml
@@ -1,625 +1,623 @@
 <?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.DepotHeadMapper">
-  <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.DepotHead">
-    <id column="Id" jdbcType="BIGINT" property="id" />
-    <result column="Type" jdbcType="VARCHAR" property="type" />
-    <result column="SubType" jdbcType="VARCHAR" property="subtype" />
-    <result column="ProjectId" jdbcType="BIGINT" property="projectid" />
-    <result column="DefaultNumber" jdbcType="VARCHAR" property="defaultnumber" />
-    <result column="Number" jdbcType="VARCHAR" property="number" />
-    <result column="OperPersonName" jdbcType="VARCHAR" property="operpersonname" />
-    <result column="CreateTime" jdbcType="TIMESTAMP" property="createtime" />
-    <result column="OperTime" jdbcType="TIMESTAMP" property="opertime" />
-    <result column="OrganId" jdbcType="BIGINT" property="organid" />
-    <result column="HandsPersonId" jdbcType="BIGINT" property="handspersonid" />
-    <result column="AccountId" jdbcType="BIGINT" property="accountid" />
-    <result column="ChangeAmount" jdbcType="DECIMAL" property="changeamount" />
-    <result column="AllocationProjectId" jdbcType="BIGINT" property="allocationprojectid" />
-    <result column="TotalPrice" jdbcType="DECIMAL" property="totalprice" />
-    <result column="PayType" jdbcType="VARCHAR" property="paytype" />
-    <result column="Remark" jdbcType="VARCHAR" property="remark" />
-    <result column="Salesman" jdbcType="VARCHAR" property="salesman" />
-    <result column="AccountIdList" jdbcType="VARCHAR" property="accountidlist" />
-    <result column="AccountMoneyList" jdbcType="VARCHAR" property="accountmoneylist" />
-    <result column="Discount" jdbcType="DECIMAL" property="discount" />
-    <result column="DiscountMoney" jdbcType="DECIMAL" property="discountmoney" />
-    <result column="DiscountLastMoney" jdbcType="DECIMAL" property="discountlastmoney" />
-    <result column="OtherMoney" jdbcType="DECIMAL" property="othermoney" />
-    <result column="OtherMoneyList" jdbcType="VARCHAR" property="othermoneylist" />
-    <result column="OtherMoneyItem" jdbcType="VARCHAR" property="othermoneyitem" />
-    <result column="AccountDay" jdbcType="INTEGER" property="accountday" />
-    <result column="Status" jdbcType="VARCHAR" property="status" />
-    <result column="LinkNumber" jdbcType="VARCHAR" property="linknumber" />
-    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
-    <result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    Id, Type, SubType, ProjectId, DefaultNumber, Number, OperPersonName, CreateTime, 
-    OperTime, OrganId, HandsPersonId, AccountId, ChangeAmount, AllocationProjectId, TotalPrice, 
-    PayType, Remark, Salesman, AccountIdList, AccountMoneyList, Discount, DiscountMoney, 
-    DiscountLastMoney, OtherMoney, OtherMoneyList, OtherMoneyItem, AccountDay, Status, 
-    LinkNumber, tenant_id, delete_Flag
-  </sql>
-  <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from jsh_depothead
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from jsh_depothead
-    where Id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from jsh_depothead
-    where Id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample">
-    delete from jsh_depothead
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.jsh.erp.datasource.entities.DepotHead">
-    <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into jsh_depothead (Id, Type, SubType, 
-      ProjectId, DefaultNumber, Number, 
-      OperPersonName, CreateTime, OperTime, 
-      OrganId, HandsPersonId, AccountId, 
-      ChangeAmount, AllocationProjectId, TotalPrice, 
-      PayType, Remark, Salesman, 
-      AccountIdList, AccountMoneyList, Discount, 
-      DiscountMoney, DiscountLastMoney, OtherMoney, 
-      OtherMoneyList, OtherMoneyItem, AccountDay, 
-      Status, LinkNumber, tenant_id, 
-      delete_Flag)
-    values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{subtype,jdbcType=VARCHAR}, 
-      #{projectid,jdbcType=BIGINT}, #{defaultnumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, 
-      #{operpersonname,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, #{opertime,jdbcType=TIMESTAMP}, 
-      #{organid,jdbcType=BIGINT}, #{handspersonid,jdbcType=BIGINT}, #{accountid,jdbcType=BIGINT}, 
-      #{changeamount,jdbcType=DECIMAL}, #{allocationprojectid,jdbcType=BIGINT}, #{totalprice,jdbcType=DECIMAL}, 
-      #{paytype,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{salesman,jdbcType=VARCHAR}, 
-      #{accountidlist,jdbcType=VARCHAR}, #{accountmoneylist,jdbcType=VARCHAR}, #{discount,jdbcType=DECIMAL}, 
-      #{discountmoney,jdbcType=DECIMAL}, #{discountlastmoney,jdbcType=DECIMAL}, #{othermoney,jdbcType=DECIMAL}, 
-      #{othermoneylist,jdbcType=VARCHAR}, #{othermoneyitem,jdbcType=VARCHAR}, #{accountday,jdbcType=INTEGER}, 
-      #{status,jdbcType=VARCHAR}, #{linknumber,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, 
-      #{deleteFlag,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.DepotHead">
-    <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into jsh_depothead
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      Id,
-      <if test="type != null">
-        Type,
-      </if>
-      <if test="subtype != null">
-        SubType,
-      </if>
-      <if test="projectid != null">
-        ProjectId,
-      </if>
-      <if test="defaultnumber != null">
-        DefaultNumber,
-      </if>
-      <if test="number != null">
-        Number,
-      </if>
-      <if test="operpersonname != null">
-        OperPersonName,
-      </if>
-      <if test="createtime != null">
-        CreateTime,
-      </if>
-      <if test="opertime != null">
-        OperTime,
-      </if>
-      <if test="organid != null">
-        OrganId,
-      </if>
-      <if test="handspersonid != null">
-        HandsPersonId,
-      </if>
-      <if test="accountid != null">
-        AccountId,
-      </if>
-      <if test="changeamount != null">
-        ChangeAmount,
-      </if>
-      <if test="allocationprojectid != null">
-        AllocationProjectId,
-      </if>
-      <if test="totalprice != null">
-        TotalPrice,
-      </if>
-      <if test="paytype != null">
-        PayType,
-      </if>
-      <if test="remark != null">
-        Remark,
-      </if>
-      <if test="salesman != null">
-        Salesman,
-      </if>
-      <if test="accountidlist != null">
-        AccountIdList,
-      </if>
-      <if test="accountmoneylist != null">
-        AccountMoneyList,
-      </if>
-      <if test="discount != null">
-        Discount,
-      </if>
-      <if test="discountmoney != null">
-        DiscountMoney,
-      </if>
-      <if test="discountlastmoney != null">
-        DiscountLastMoney,
-      </if>
-      <if test="othermoney != null">
-        OtherMoney,
-      </if>
-      <if test="othermoneylist != null">
-        OtherMoneyList,
-      </if>
-      <if test="othermoneyitem != null">
-        OtherMoneyItem,
-      </if>
-      <if test="accountday != null">
-        AccountDay,
-      </if>
-      <if test="status != null">
-        Status,
-      </if>
-      <if test="linknumber != null">
-        LinkNumber,
-      </if>
-      <if test="tenantId != null">
-        tenant_id,
-      </if>
-      <if test="deleteFlag != null">
-        delete_Flag,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      #{id,jdbcType=BIGINT},
-      <if test="type != null">
-        #{type,jdbcType=VARCHAR},
-      </if>
-      <if test="subtype != null">
-        #{subtype,jdbcType=VARCHAR},
-      </if>
-      <if test="projectid != null">
-        #{projectid,jdbcType=BIGINT},
-      </if>
-      <if test="defaultnumber != null">
-        #{defaultnumber,jdbcType=VARCHAR},
-      </if>
-      <if test="number != null">
-        #{number,jdbcType=VARCHAR},
-      </if>
-      <if test="operpersonname != null">
-        #{operpersonname,jdbcType=VARCHAR},
-      </if>
-      <if test="createtime != null">
-        #{createtime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="opertime != null">
-        #{opertime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="organid != null">
-        #{organid,jdbcType=BIGINT},
-      </if>
-      <if test="handspersonid != null">
-        #{handspersonid,jdbcType=BIGINT},
-      </if>
-      <if test="accountid != null">
-        #{accountid,jdbcType=BIGINT},
-      </if>
-      <if test="changeamount != null">
-        #{changeamount,jdbcType=DECIMAL},
-      </if>
-      <if test="allocationprojectid != null">
-        #{allocationprojectid,jdbcType=BIGINT},
-      </if>
-      <if test="totalprice != null">
-        #{totalprice,jdbcType=DECIMAL},
-      </if>
-      <if test="paytype != null">
-        #{paytype,jdbcType=VARCHAR},
-      </if>
-      <if test="remark != null">
-        #{remark,jdbcType=VARCHAR},
-      </if>
-      <if test="salesman != null">
-        #{salesman,jdbcType=VARCHAR},
-      </if>
-      <if test="accountidlist != null">
-        #{accountidlist,jdbcType=VARCHAR},
-      </if>
-      <if test="accountmoneylist != null">
-        #{accountmoneylist,jdbcType=VARCHAR},
-      </if>
-      <if test="discount != null">
-        #{discount,jdbcType=DECIMAL},
-      </if>
-      <if test="discountmoney != null">
-        #{discountmoney,jdbcType=DECIMAL},
-      </if>
-      <if test="discountlastmoney != null">
-        #{discountlastmoney,jdbcType=DECIMAL},
-      </if>
-      <if test="othermoney != null">
-        #{othermoney,jdbcType=DECIMAL},
-      </if>
-      <if test="othermoneylist != null">
-        #{othermoneylist,jdbcType=VARCHAR},
-      </if>
-      <if test="othermoneyitem != null">
-        #{othermoneyitem,jdbcType=VARCHAR},
-      </if>
-      <if test="accountday != null">
-        #{accountday,jdbcType=INTEGER},
-      </if>
-      <if test="status != null">
-        #{status,jdbcType=VARCHAR},
-      </if>
-      <if test="linknumber != null">
-        #{linknumber,jdbcType=VARCHAR},
-      </if>
-      <if test="tenantId != null">
-        #{tenantId,jdbcType=BIGINT},
-      </if>
-      <if test="deleteFlag != null">
-        #{deleteFlag,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultType="java.lang.Integer">
-    select count(*) from jsh_depothead
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update jsh_depothead
-    <set>
-      <if test="record.id != null">
-        Id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.type != null">
-        Type = #{record.type,jdbcType=VARCHAR},
-      </if>
-      <if test="record.subtype != null">
-        SubType = #{record.subtype,jdbcType=VARCHAR},
-      </if>
-      <if test="record.projectid != null">
-        ProjectId = #{record.projectid,jdbcType=BIGINT},
-      </if>
-      <if test="record.defaultnumber != null">
-        DefaultNumber = #{record.defaultnumber,jdbcType=VARCHAR},
-      </if>
-      <if test="record.number != null">
-        Number = #{record.number,jdbcType=VARCHAR},
-      </if>
-      <if test="record.operpersonname != null">
-        OperPersonName = #{record.operpersonname,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createtime != null">
-        CreateTime = #{record.createtime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.opertime != null">
-        OperTime = #{record.opertime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.organid != null">
-        OrganId = #{record.organid,jdbcType=BIGINT},
-      </if>
-      <if test="record.handspersonid != null">
-        HandsPersonId = #{record.handspersonid,jdbcType=BIGINT},
-      </if>
-      <if test="record.accountid != null">
-        AccountId = #{record.accountid,jdbcType=BIGINT},
-      </if>
-      <if test="record.changeamount != null">
-        ChangeAmount = #{record.changeamount,jdbcType=DECIMAL},
-      </if>
-      <if test="record.allocationprojectid != null">
-        AllocationProjectId = #{record.allocationprojectid,jdbcType=BIGINT},
-      </if>
-      <if test="record.totalprice != null">
-        TotalPrice = #{record.totalprice,jdbcType=DECIMAL},
-      </if>
-      <if test="record.paytype != null">
-        PayType = #{record.paytype,jdbcType=VARCHAR},
-      </if>
-      <if test="record.remark != null">
-        Remark = #{record.remark,jdbcType=VARCHAR},
-      </if>
-      <if test="record.salesman != null">
-        Salesman = #{record.salesman,jdbcType=VARCHAR},
-      </if>
-      <if test="record.accountidlist != null">
-        AccountIdList = #{record.accountidlist,jdbcType=VARCHAR},
-      </if>
-      <if test="record.accountmoneylist != null">
-        AccountMoneyList = #{record.accountmoneylist,jdbcType=VARCHAR},
-      </if>
-      <if test="record.discount != null">
-        Discount = #{record.discount,jdbcType=DECIMAL},
-      </if>
-      <if test="record.discountmoney != null">
-        DiscountMoney = #{record.discountmoney,jdbcType=DECIMAL},
-      </if>
-      <if test="record.discountlastmoney != null">
-        DiscountLastMoney = #{record.discountlastmoney,jdbcType=DECIMAL},
-      </if>
-      <if test="record.othermoney != null">
-        OtherMoney = #{record.othermoney,jdbcType=DECIMAL},
-      </if>
-      <if test="record.othermoneylist != null">
-        OtherMoneyList = #{record.othermoneylist,jdbcType=VARCHAR},
-      </if>
-      <if test="record.othermoneyitem != null">
-        OtherMoneyItem = #{record.othermoneyitem,jdbcType=VARCHAR},
-      </if>
-      <if test="record.accountday != null">
-        AccountDay = #{record.accountday,jdbcType=INTEGER},
-      </if>
-      <if test="record.status != null">
-        Status = #{record.status,jdbcType=VARCHAR},
-      </if>
-      <if test="record.linknumber != null">
-        LinkNumber = #{record.linknumber,jdbcType=VARCHAR},
-      </if>
-      <if test="record.tenantId != null">
-        tenant_id = #{record.tenantId,jdbcType=BIGINT},
-      </if>
-      <if test="record.deleteFlag != null">
-        delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update jsh_depothead
-    set Id = #{record.id,jdbcType=BIGINT},
-      Type = #{record.type,jdbcType=VARCHAR},
-      SubType = #{record.subtype,jdbcType=VARCHAR},
-      ProjectId = #{record.projectid,jdbcType=BIGINT},
-      DefaultNumber = #{record.defaultnumber,jdbcType=VARCHAR},
-      Number = #{record.number,jdbcType=VARCHAR},
-      OperPersonName = #{record.operpersonname,jdbcType=VARCHAR},
-      CreateTime = #{record.createtime,jdbcType=TIMESTAMP},
-      OperTime = #{record.opertime,jdbcType=TIMESTAMP},
-      OrganId = #{record.organid,jdbcType=BIGINT},
-      HandsPersonId = #{record.handspersonid,jdbcType=BIGINT},
-      AccountId = #{record.accountid,jdbcType=BIGINT},
-      ChangeAmount = #{record.changeamount,jdbcType=DECIMAL},
-      AllocationProjectId = #{record.allocationprojectid,jdbcType=BIGINT},
-      TotalPrice = #{record.totalprice,jdbcType=DECIMAL},
-      PayType = #{record.paytype,jdbcType=VARCHAR},
-      Remark = #{record.remark,jdbcType=VARCHAR},
-      Salesman = #{record.salesman,jdbcType=VARCHAR},
-      AccountIdList = #{record.accountidlist,jdbcType=VARCHAR},
-      AccountMoneyList = #{record.accountmoneylist,jdbcType=VARCHAR},
-      Discount = #{record.discount,jdbcType=DECIMAL},
-      DiscountMoney = #{record.discountmoney,jdbcType=DECIMAL},
-      DiscountLastMoney = #{record.discountlastmoney,jdbcType=DECIMAL},
-      OtherMoney = #{record.othermoney,jdbcType=DECIMAL},
-      OtherMoneyList = #{record.othermoneylist,jdbcType=VARCHAR},
-      OtherMoneyItem = #{record.othermoneyitem,jdbcType=VARCHAR},
-      AccountDay = #{record.accountday,jdbcType=INTEGER},
-      Status = #{record.status,jdbcType=VARCHAR},
-      LinkNumber = #{record.linknumber,jdbcType=VARCHAR},
-      tenant_id = #{record.tenantId,jdbcType=BIGINT},
-      delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.DepotHead">
-    update jsh_depothead
-    <set>
-      <if test="type != null">
-        Type = #{type,jdbcType=VARCHAR},
-      </if>
-      <if test="subtype != null">
-        SubType = #{subtype,jdbcType=VARCHAR},
-      </if>
-      <if test="projectid != null">
-        ProjectId = #{projectid,jdbcType=BIGINT},
-      </if>
-      <if test="defaultnumber != null">
-        DefaultNumber = #{defaultnumber,jdbcType=VARCHAR},
-      </if>
-      <if test="number != null">
-        Number = #{number,jdbcType=VARCHAR},
-      </if>
-      <if test="operpersonname != null">
-        OperPersonName = #{operpersonname,jdbcType=VARCHAR},
-      </if>
-      <if test="createtime != null">
-        CreateTime = #{createtime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="opertime != null">
-        OperTime = #{opertime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="organid != null">
-        OrganId = #{organid,jdbcType=BIGINT},
-      </if>
-      <if test="handspersonid != null">
-        HandsPersonId = #{handspersonid,jdbcType=BIGINT},
-      </if>
-      <if test="accountid != null">
-        AccountId = #{accountid,jdbcType=BIGINT},
-      </if>
-      <if test="changeamount != null">
-        ChangeAmount = #{changeamount,jdbcType=DECIMAL},
-      </if>
-      <if test="allocationprojectid != null">
-        AllocationProjectId = #{allocationprojectid,jdbcType=BIGINT},
-      </if>
-      <if test="totalprice != null">
-        TotalPrice = #{totalprice,jdbcType=DECIMAL},
-      </if>
-      <if test="paytype != null">
-        PayType = #{paytype,jdbcType=VARCHAR},
-      </if>
-      <if test="remark != null">
-        Remark = #{remark,jdbcType=VARCHAR},
-      </if>
-      <if test="salesman != null">
-        Salesman = #{salesman,jdbcType=VARCHAR},
-      </if>
-      <if test="accountidlist != null">
-        AccountIdList = #{accountidlist,jdbcType=VARCHAR},
-      </if>
-      <if test="accountmoneylist != null">
-        AccountMoneyList = #{accountmoneylist,jdbcType=VARCHAR},
-      </if>
-      <if test="discount != null">
-        Discount = #{discount,jdbcType=DECIMAL},
-      </if>
-      <if test="discountmoney != null">
-        DiscountMoney = #{discountmoney,jdbcType=DECIMAL},
-      </if>
-      <if test="discountlastmoney != null">
-        DiscountLastMoney = #{discountlastmoney,jdbcType=DECIMAL},
-      </if>
-      <if test="othermoney != null">
-        OtherMoney = #{othermoney,jdbcType=DECIMAL},
-      </if>
-      <if test="othermoneylist != null">
-        OtherMoneyList = #{othermoneylist,jdbcType=VARCHAR},
-      </if>
-      <if test="othermoneyitem != null">
-        OtherMoneyItem = #{othermoneyitem,jdbcType=VARCHAR},
-      </if>
-      <if test="accountday != null">
-        AccountDay = #{accountday,jdbcType=INTEGER},
-      </if>
-      <if test="status != null">
-        Status = #{status,jdbcType=VARCHAR},
-      </if>
-      <if test="linknumber != null">
-        LinkNumber = #{linknumber,jdbcType=VARCHAR},
-      </if>
-      <if test="tenantId != null">
-        tenant_id = #{tenantId,jdbcType=BIGINT},
-      </if>
-      <if test="deleteFlag != null">
-        delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where Id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.DepotHead">
-    update jsh_depothead
-    set Type = #{type,jdbcType=VARCHAR},
-      SubType = #{subtype,jdbcType=VARCHAR},
-      ProjectId = #{projectid,jdbcType=BIGINT},
-      DefaultNumber = #{defaultnumber,jdbcType=VARCHAR},
-      Number = #{number,jdbcType=VARCHAR},
-      OperPersonName = #{operpersonname,jdbcType=VARCHAR},
-      CreateTime = #{createtime,jdbcType=TIMESTAMP},
-      OperTime = #{opertime,jdbcType=TIMESTAMP},
-      OrganId = #{organid,jdbcType=BIGINT},
-      HandsPersonId = #{handspersonid,jdbcType=BIGINT},
-      AccountId = #{accountid,jdbcType=BIGINT},
-      ChangeAmount = #{changeamount,jdbcType=DECIMAL},
-      AllocationProjectId = #{allocationprojectid,jdbcType=BIGINT},
-      TotalPrice = #{totalprice,jdbcType=DECIMAL},
-      PayType = #{paytype,jdbcType=VARCHAR},
-      Remark = #{remark,jdbcType=VARCHAR},
-      Salesman = #{salesman,jdbcType=VARCHAR},
-      AccountIdList = #{accountidlist,jdbcType=VARCHAR},
-      AccountMoneyList = #{accountmoneylist,jdbcType=VARCHAR},
-      Discount = #{discount,jdbcType=DECIMAL},
-      DiscountMoney = #{discountmoney,jdbcType=DECIMAL},
-      DiscountLastMoney = #{discountlastmoney,jdbcType=DECIMAL},
-      OtherMoney = #{othermoney,jdbcType=DECIMAL},
-      OtherMoneyList = #{othermoneylist,jdbcType=VARCHAR},
-      OtherMoneyItem = #{othermoneyitem,jdbcType=VARCHAR},
-      AccountDay = #{accountday,jdbcType=INTEGER},
-      Status = #{status,jdbcType=VARCHAR},
-      LinkNumber = #{linknumber,jdbcType=VARCHAR},
-      tenant_id = #{tenantId,jdbcType=BIGINT},
-      delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
-    where Id = #{id,jdbcType=BIGINT}
-  </update>
+<mapper namespace="com.jsh.erp.datasource.mappers.DepotHeadMapper">
+  <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.DepotHead">
+    <id column="Id" jdbcType="BIGINT" property="id" />
+    <result column="Type" jdbcType="VARCHAR" property="type" />
+    <result column="SubType" jdbcType="VARCHAR" property="subtype" />
+    <result column="ProjectId" jdbcType="BIGINT" property="projectid" />
+    <result column="DefaultNumber" jdbcType="VARCHAR" property="defaultnumber" />
+    <result column="Number" jdbcType="VARCHAR" property="number" />
+    <result column="OperPersonName" jdbcType="VARCHAR" property="operpersonname" />
+    <result column="CreateTime" jdbcType="TIMESTAMP" property="createtime" />
+    <result column="OperTime" jdbcType="TIMESTAMP" property="opertime" />
+    <result column="OrganId" jdbcType="BIGINT" property="organid" />
+    <result column="HandsPersonId" jdbcType="BIGINT" property="handspersonid" />
+    <result column="AccountId" jdbcType="BIGINT" property="accountid" />
+    <result column="ChangeAmount" jdbcType="DECIMAL" property="changeamount" />
+    <result column="AllocationProjectId" jdbcType="BIGINT" property="allocationprojectid" />
+    <result column="TotalPrice" jdbcType="DECIMAL" property="totalprice" />
+    <result column="PayType" jdbcType="VARCHAR" property="paytype" />
+    <result column="Remark" jdbcType="VARCHAR" property="remark" />
+    <result column="Salesman" jdbcType="VARCHAR" property="salesman" />
+    <result column="AccountIdList" jdbcType="VARCHAR" property="accountidlist" />
+    <result column="AccountMoneyList" jdbcType="VARCHAR" property="accountmoneylist" />
+    <result column="Discount" jdbcType="DECIMAL" property="discount" />
+    <result column="DiscountMoney" jdbcType="DECIMAL" property="discountmoney" />
+    <result column="DiscountLastMoney" jdbcType="DECIMAL" property="discountlastmoney" />
+    <result column="OtherMoney" jdbcType="DECIMAL" property="othermoney" />
+    <result column="OtherMoneyList" jdbcType="VARCHAR" property="othermoneylist" />
+    <result column="OtherMoneyItem" jdbcType="VARCHAR" property="othermoneyitem" />
+    <result column="AccountDay" jdbcType="INTEGER" property="accountday" />
+    <result column="Status" jdbcType="VARCHAR" property="status" />
+    <result column="LinkNumber" jdbcType="VARCHAR" property="linknumber" />
+    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
+    <result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    Id, Type, SubType, ProjectId, DefaultNumber, Number, OperPersonName, CreateTime, 
+    OperTime, OrganId, HandsPersonId, AccountId, ChangeAmount, AllocationProjectId, TotalPrice, 
+    PayType, Remark, Salesman, AccountIdList, AccountMoneyList, Discount, DiscountMoney, 
+    DiscountLastMoney, OtherMoney, OtherMoneyList, OtherMoneyItem, AccountDay, Status, 
+    LinkNumber, tenant_id, delete_Flag
+  </sql>
+  <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from jsh_depothead
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from jsh_depothead
+    where Id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from jsh_depothead
+    where Id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample">
+    delete from jsh_depothead
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.jsh.erp.datasource.entities.DepotHead">
+    insert into jsh_depothead (Id, Type, SubType, 
+      ProjectId, DefaultNumber, Number, 
+      OperPersonName, CreateTime, OperTime, 
+      OrganId, HandsPersonId, AccountId, 
+      ChangeAmount, AllocationProjectId, TotalPrice, 
+      PayType, Remark, Salesman, 
+      AccountIdList, AccountMoneyList, Discount, 
+      DiscountMoney, DiscountLastMoney, OtherMoney, 
+      OtherMoneyList, OtherMoneyItem, AccountDay, 
+      Status, LinkNumber, tenant_id, 
+      delete_Flag)
+    values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{subtype,jdbcType=VARCHAR}, 
+      #{projectid,jdbcType=BIGINT}, #{defaultnumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, 
+      #{operpersonname,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, #{opertime,jdbcType=TIMESTAMP}, 
+      #{organid,jdbcType=BIGINT}, #{handspersonid,jdbcType=BIGINT}, #{accountid,jdbcType=BIGINT}, 
+      #{changeamount,jdbcType=DECIMAL}, #{allocationprojectid,jdbcType=BIGINT}, #{totalprice,jdbcType=DECIMAL}, 
+      #{paytype,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{salesman,jdbcType=VARCHAR}, 
+      #{accountidlist,jdbcType=VARCHAR}, #{accountmoneylist,jdbcType=VARCHAR}, #{discount,jdbcType=DECIMAL}, 
+      #{discountmoney,jdbcType=DECIMAL}, #{discountlastmoney,jdbcType=DECIMAL}, #{othermoney,jdbcType=DECIMAL}, 
+      #{othermoneylist,jdbcType=VARCHAR}, #{othermoneyitem,jdbcType=VARCHAR}, #{accountday,jdbcType=INTEGER}, 
+      #{status,jdbcType=VARCHAR}, #{linknumber,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, 
+      #{deleteFlag,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.DepotHead">
+    insert into jsh_depothead
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        Id,
+      </if>
+      <if test="type != null">
+        Type,
+      </if>
+      <if test="subtype != null">
+        SubType,
+      </if>
+      <if test="projectid != null">
+        ProjectId,
+      </if>
+      <if test="defaultnumber != null">
+        DefaultNumber,
+      </if>
+      <if test="number != null">
+        Number,
+      </if>
+      <if test="operpersonname != null">
+        OperPersonName,
+      </if>
+      <if test="createtime != null">
+        CreateTime,
+      </if>
+      <if test="opertime != null">
+        OperTime,
+      </if>
+      <if test="organid != null">
+        OrganId,
+      </if>
+      <if test="handspersonid != null">
+        HandsPersonId,
+      </if>
+      <if test="accountid != null">
+        AccountId,
+      </if>
+      <if test="changeamount != null">
+        ChangeAmount,
+      </if>
+      <if test="allocationprojectid != null">
+        AllocationProjectId,
+      </if>
+      <if test="totalprice != null">
+        TotalPrice,
+      </if>
+      <if test="paytype != null">
+        PayType,
+      </if>
+      <if test="remark != null">
+        Remark,
+      </if>
+      <if test="salesman != null">
+        Salesman,
+      </if>
+      <if test="accountidlist != null">
+        AccountIdList,
+      </if>
+      <if test="accountmoneylist != null">
+        AccountMoneyList,
+      </if>
+      <if test="discount != null">
+        Discount,
+      </if>
+      <if test="discountmoney != null">
+        DiscountMoney,
+      </if>
+      <if test="discountlastmoney != null">
+        DiscountLastMoney,
+      </if>
+      <if test="othermoney != null">
+        OtherMoney,
+      </if>
+      <if test="othermoneylist != null">
+        OtherMoneyList,
+      </if>
+      <if test="othermoneyitem != null">
+        OtherMoneyItem,
+      </if>
+      <if test="accountday != null">
+        AccountDay,
+      </if>
+      <if test="status != null">
+        Status,
+      </if>
+      <if test="linknumber != null">
+        LinkNumber,
+      </if>
+      <if test="tenantId != null">
+        tenant_id,
+      </if>
+      <if test="deleteFlag != null">
+        delete_Flag,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="subtype != null">
+        #{subtype,jdbcType=VARCHAR},
+      </if>
+      <if test="projectid != null">
+        #{projectid,jdbcType=BIGINT},
+      </if>
+      <if test="defaultnumber != null">
+        #{defaultnumber,jdbcType=VARCHAR},
+      </if>
+      <if test="number != null">
+        #{number,jdbcType=VARCHAR},
+      </if>
+      <if test="operpersonname != null">
+        #{operpersonname,jdbcType=VARCHAR},
+      </if>
+      <if test="createtime != null">
+        #{createtime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="opertime != null">
+        #{opertime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="organid != null">
+        #{organid,jdbcType=BIGINT},
+      </if>
+      <if test="handspersonid != null">
+        #{handspersonid,jdbcType=BIGINT},
+      </if>
+      <if test="accountid != null">
+        #{accountid,jdbcType=BIGINT},
+      </if>
+      <if test="changeamount != null">
+        #{changeamount,jdbcType=DECIMAL},
+      </if>
+      <if test="allocationprojectid != null">
+        #{allocationprojectid,jdbcType=BIGINT},
+      </if>
+      <if test="totalprice != null">
+        #{totalprice,jdbcType=DECIMAL},
+      </if>
+      <if test="paytype != null">
+        #{paytype,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="salesman != null">
+        #{salesman,jdbcType=VARCHAR},
+      </if>
+      <if test="accountidlist != null">
+        #{accountidlist,jdbcType=VARCHAR},
+      </if>
+      <if test="accountmoneylist != null">
+        #{accountmoneylist,jdbcType=VARCHAR},
+      </if>
+      <if test="discount != null">
+        #{discount,jdbcType=DECIMAL},
+      </if>
+      <if test="discountmoney != null">
+        #{discountmoney,jdbcType=DECIMAL},
+      </if>
+      <if test="discountlastmoney != null">
+        #{discountlastmoney,jdbcType=DECIMAL},
+      </if>
+      <if test="othermoney != null">
+        #{othermoney,jdbcType=DECIMAL},
+      </if>
+      <if test="othermoneylist != null">
+        #{othermoneylist,jdbcType=VARCHAR},
+      </if>
+      <if test="othermoneyitem != null">
+        #{othermoneyitem,jdbcType=VARCHAR},
+      </if>
+      <if test="accountday != null">
+        #{accountday,jdbcType=INTEGER},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="linknumber != null">
+        #{linknumber,jdbcType=VARCHAR},
+      </if>
+      <if test="tenantId != null">
+        #{tenantId,jdbcType=BIGINT},
+      </if>
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultType="java.lang.Long">
+    select count(*) from jsh_depothead
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update jsh_depothead
+    <set>
+      <if test="record.id != null">
+        Id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.type != null">
+        Type = #{record.type,jdbcType=VARCHAR},
+      </if>
+      <if test="record.subtype != null">
+        SubType = #{record.subtype,jdbcType=VARCHAR},
+      </if>
+      <if test="record.projectid != null">
+        ProjectId = #{record.projectid,jdbcType=BIGINT},
+      </if>
+      <if test="record.defaultnumber != null">
+        DefaultNumber = #{record.defaultnumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.number != null">
+        Number = #{record.number,jdbcType=VARCHAR},
+      </if>
+      <if test="record.operpersonname != null">
+        OperPersonName = #{record.operpersonname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createtime != null">
+        CreateTime = #{record.createtime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.opertime != null">
+        OperTime = #{record.opertime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.organid != null">
+        OrganId = #{record.organid,jdbcType=BIGINT},
+      </if>
+      <if test="record.handspersonid != null">
+        HandsPersonId = #{record.handspersonid,jdbcType=BIGINT},
+      </if>
+      <if test="record.accountid != null">
+        AccountId = #{record.accountid,jdbcType=BIGINT},
+      </if>
+      <if test="record.changeamount != null">
+        ChangeAmount = #{record.changeamount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.allocationprojectid != null">
+        AllocationProjectId = #{record.allocationprojectid,jdbcType=BIGINT},
+      </if>
+      <if test="record.totalprice != null">
+        TotalPrice = #{record.totalprice,jdbcType=DECIMAL},
+      </if>
+      <if test="record.paytype != null">
+        PayType = #{record.paytype,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remark != null">
+        Remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.salesman != null">
+        Salesman = #{record.salesman,jdbcType=VARCHAR},
+      </if>
+      <if test="record.accountidlist != null">
+        AccountIdList = #{record.accountidlist,jdbcType=VARCHAR},
+      </if>
+      <if test="record.accountmoneylist != null">
+        AccountMoneyList = #{record.accountmoneylist,jdbcType=VARCHAR},
+      </if>
+      <if test="record.discount != null">
+        Discount = #{record.discount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.discountmoney != null">
+        DiscountMoney = #{record.discountmoney,jdbcType=DECIMAL},
+      </if>
+      <if test="record.discountlastmoney != null">
+        DiscountLastMoney = #{record.discountlastmoney,jdbcType=DECIMAL},
+      </if>
+      <if test="record.othermoney != null">
+        OtherMoney = #{record.othermoney,jdbcType=DECIMAL},
+      </if>
+      <if test="record.othermoneylist != null">
+        OtherMoneyList = #{record.othermoneylist,jdbcType=VARCHAR},
+      </if>
+      <if test="record.othermoneyitem != null">
+        OtherMoneyItem = #{record.othermoneyitem,jdbcType=VARCHAR},
+      </if>
+      <if test="record.accountday != null">
+        AccountDay = #{record.accountday,jdbcType=INTEGER},
+      </if>
+      <if test="record.status != null">
+        Status = #{record.status,jdbcType=VARCHAR},
+      </if>
+      <if test="record.linknumber != null">
+        LinkNumber = #{record.linknumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.tenantId != null">
+        tenant_id = #{record.tenantId,jdbcType=BIGINT},
+      </if>
+      <if test="record.deleteFlag != null">
+        delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update jsh_depothead
+    set Id = #{record.id,jdbcType=BIGINT},
+      Type = #{record.type,jdbcType=VARCHAR},
+      SubType = #{record.subtype,jdbcType=VARCHAR},
+      ProjectId = #{record.projectid,jdbcType=BIGINT},
+      DefaultNumber = #{record.defaultnumber,jdbcType=VARCHAR},
+      Number = #{record.number,jdbcType=VARCHAR},
+      OperPersonName = #{record.operpersonname,jdbcType=VARCHAR},
+      CreateTime = #{record.createtime,jdbcType=TIMESTAMP},
+      OperTime = #{record.opertime,jdbcType=TIMESTAMP},
+      OrganId = #{record.organid,jdbcType=BIGINT},
+      HandsPersonId = #{record.handspersonid,jdbcType=BIGINT},
+      AccountId = #{record.accountid,jdbcType=BIGINT},
+      ChangeAmount = #{record.changeamount,jdbcType=DECIMAL},
+      AllocationProjectId = #{record.allocationprojectid,jdbcType=BIGINT},
+      TotalPrice = #{record.totalprice,jdbcType=DECIMAL},
+      PayType = #{record.paytype,jdbcType=VARCHAR},
+      Remark = #{record.remark,jdbcType=VARCHAR},
+      Salesman = #{record.salesman,jdbcType=VARCHAR},
+      AccountIdList = #{record.accountidlist,jdbcType=VARCHAR},
+      AccountMoneyList = #{record.accountmoneylist,jdbcType=VARCHAR},
+      Discount = #{record.discount,jdbcType=DECIMAL},
+      DiscountMoney = #{record.discountmoney,jdbcType=DECIMAL},
+      DiscountLastMoney = #{record.discountlastmoney,jdbcType=DECIMAL},
+      OtherMoney = #{record.othermoney,jdbcType=DECIMAL},
+      OtherMoneyList = #{record.othermoneylist,jdbcType=VARCHAR},
+      OtherMoneyItem = #{record.othermoneyitem,jdbcType=VARCHAR},
+      AccountDay = #{record.accountday,jdbcType=INTEGER},
+      Status = #{record.status,jdbcType=VARCHAR},
+      LinkNumber = #{record.linknumber,jdbcType=VARCHAR},
+      tenant_id = #{record.tenantId,jdbcType=BIGINT},
+      delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.DepotHead">
+    update jsh_depothead
+    <set>
+      <if test="type != null">
+        Type = #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="subtype != null">
+        SubType = #{subtype,jdbcType=VARCHAR},
+      </if>
+      <if test="projectid != null">
+        ProjectId = #{projectid,jdbcType=BIGINT},
+      </if>
+      <if test="defaultnumber != null">
+        DefaultNumber = #{defaultnumber,jdbcType=VARCHAR},
+      </if>
+      <if test="number != null">
+        Number = #{number,jdbcType=VARCHAR},
+      </if>
+      <if test="operpersonname != null">
+        OperPersonName = #{operpersonname,jdbcType=VARCHAR},
+      </if>
+      <if test="createtime != null">
+        CreateTime = #{createtime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="opertime != null">
+        OperTime = #{opertime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="organid != null">
+        OrganId = #{organid,jdbcType=BIGINT},
+      </if>
+      <if test="handspersonid != null">
+        HandsPersonId = #{handspersonid,jdbcType=BIGINT},
+      </if>
+      <if test="accountid != null">
+        AccountId = #{accountid,jdbcType=BIGINT},
+      </if>
+      <if test="changeamount != null">
+        ChangeAmount = #{changeamount,jdbcType=DECIMAL},
+      </if>
+      <if test="allocationprojectid != null">
+        AllocationProjectId = #{allocationprojectid,jdbcType=BIGINT},
+      </if>
+      <if test="totalprice != null">
+        TotalPrice = #{totalprice,jdbcType=DECIMAL},
+      </if>
+      <if test="paytype != null">
+        PayType = #{paytype,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        Remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="salesman != null">
+        Salesman = #{salesman,jdbcType=VARCHAR},
+      </if>
+      <if test="accountidlist != null">
+        AccountIdList = #{accountidlist,jdbcType=VARCHAR},
+      </if>
+      <if test="accountmoneylist != null">
+        AccountMoneyList = #{accountmoneylist,jdbcType=VARCHAR},
+      </if>
+      <if test="discount != null">
+        Discount = #{discount,jdbcType=DECIMAL},
+      </if>
+      <if test="discountmoney != null">
+        DiscountMoney = #{discountmoney,jdbcType=DECIMAL},
+      </if>
+      <if test="discountlastmoney != null">
+        DiscountLastMoney = #{discountlastmoney,jdbcType=DECIMAL},
+      </if>
+      <if test="othermoney != null">
+        OtherMoney = #{othermoney,jdbcType=DECIMAL},
+      </if>
+      <if test="othermoneylist != null">
+        OtherMoneyList = #{othermoneylist,jdbcType=VARCHAR},
+      </if>
+      <if test="othermoneyitem != null">
+        OtherMoneyItem = #{othermoneyitem,jdbcType=VARCHAR},
+      </if>
+      <if test="accountday != null">
+        AccountDay = #{accountday,jdbcType=INTEGER},
+      </if>
+      <if test="status != null">
+        Status = #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="linknumber != null">
+        LinkNumber = #{linknumber,jdbcType=VARCHAR},
+      </if>
+      <if test="tenantId != null">
+        tenant_id = #{tenantId,jdbcType=BIGINT},
+      </if>
+      <if test="deleteFlag != null">
+        delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where Id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.DepotHead">
+    update jsh_depothead
+    set Type = #{type,jdbcType=VARCHAR},
+      SubType = #{subtype,jdbcType=VARCHAR},
+      ProjectId = #{projectid,jdbcType=BIGINT},
+      DefaultNumber = #{defaultnumber,jdbcType=VARCHAR},
+      Number = #{number,jdbcType=VARCHAR},
+      OperPersonName = #{operpersonname,jdbcType=VARCHAR},
+      CreateTime = #{createtime,jdbcType=TIMESTAMP},
+      OperTime = #{opertime,jdbcType=TIMESTAMP},
+      OrganId = #{organid,jdbcType=BIGINT},
+      HandsPersonId = #{handspersonid,jdbcType=BIGINT},
+      AccountId = #{accountid,jdbcType=BIGINT},
+      ChangeAmount = #{changeamount,jdbcType=DECIMAL},
+      AllocationProjectId = #{allocationprojectid,jdbcType=BIGINT},
+      TotalPrice = #{totalprice,jdbcType=DECIMAL},
+      PayType = #{paytype,jdbcType=VARCHAR},
+      Remark = #{remark,jdbcType=VARCHAR},
+      Salesman = #{salesman,jdbcType=VARCHAR},
+      AccountIdList = #{accountidlist,jdbcType=VARCHAR},
+      AccountMoneyList = #{accountmoneylist,jdbcType=VARCHAR},
+      Discount = #{discount,jdbcType=DECIMAL},
+      DiscountMoney = #{discountmoney,jdbcType=DECIMAL},
+      DiscountLastMoney = #{discountlastmoney,jdbcType=DECIMAL},
+      OtherMoney = #{othermoney,jdbcType=DECIMAL},
+      OtherMoneyList = #{othermoneylist,jdbcType=VARCHAR},
+      OtherMoneyItem = #{othermoneyitem,jdbcType=VARCHAR},
+      AccountDay = #{accountday,jdbcType=INTEGER},
+      Status = #{status,jdbcType=VARCHAR},
+      LinkNumber = #{linknumber,jdbcType=VARCHAR},
+      tenant_id = #{tenantId,jdbcType=BIGINT},
+      delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
+    where Id = #{id,jdbcType=BIGINT}
+  </update>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper_xml/UserMapper.xml b/src/main/resources/mapper_xml/UserMapper.xml
index 943a8ec5..f960b482 100644
--- a/src/main/resources/mapper_xml/UserMapper.xml
+++ b/src/main/resources/mapper_xml/UserMapper.xml
@@ -1,355 +1,353 @@
 <?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">
-  <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.User">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="username" jdbcType="VARCHAR" property="username" />
-    <result column="loginame" jdbcType="VARCHAR" property="loginame" />
-    <result column="password" jdbcType="VARCHAR" property="password" />
-    <result column="position" jdbcType="VARCHAR" property="position" />
-    <result column="department" jdbcType="VARCHAR" property="department" />
-    <result column="email" jdbcType="VARCHAR" property="email" />
-    <result column="phonenum" jdbcType="VARCHAR" property="phonenum" />
-    <result column="ismanager" jdbcType="TINYINT" property="ismanager" />
-    <result column="isystem" jdbcType="TINYINT" property="isystem" />
-    <result column="Status" jdbcType="TINYINT" property="status" />
-    <result column="description" jdbcType="VARCHAR" property="description" />
-    <result column="remark" jdbcType="VARCHAR" property="remark" />
-    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, username, loginame, password, position, department, email, phonenum, ismanager, 
-    isystem, Status, description, remark, tenant_id
-  </sql>
-  <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.UserExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from jsh_user
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from jsh_user
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from jsh_user
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.UserExample">
-    delete from jsh_user
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.jsh.erp.datasource.entities.User">
-    <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into jsh_user (id, username, loginame, 
-      password, position, department, 
-      email, phonenum, ismanager, 
-      isystem, Status, description, 
-      remark, tenant_id)
-    values (#{id,jdbcType=BIGINT}, #{username,jdbcType=VARCHAR}, #{loginame,jdbcType=VARCHAR}, 
-      #{password,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR}, #{department,jdbcType=VARCHAR}, 
-      #{email,jdbcType=VARCHAR}, #{phonenum,jdbcType=VARCHAR}, #{ismanager,jdbcType=TINYINT}, 
-      #{isystem,jdbcType=TINYINT}, #{status,jdbcType=TINYINT}, #{description,jdbcType=VARCHAR}, 
-      #{remark,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT})
-  </insert>
-  <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.User">
-    <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into jsh_user
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      id,
-      <if test="username != null">
-        username,
-      </if>
-      <if test="loginame != null">
-        loginame,
-      </if>
-      <if test="password != null">
-        password,
-      </if>
-      <if test="position != null">
-        position,
-      </if>
-      <if test="department != null">
-        department,
-      </if>
-      <if test="email != null">
-        email,
-      </if>
-      <if test="phonenum != null">
-        phonenum,
-      </if>
-      <if test="ismanager != null">
-        ismanager,
-      </if>
-      <if test="isystem != null">
-        isystem,
-      </if>
-      <if test="status != null">
-        Status,
-      </if>
-      <if test="description != null">
-        description,
-      </if>
-      <if test="remark != null">
-        remark,
-      </if>
-      <if test="tenantId != null">
-        tenant_id,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      #{id,jdbcType=BIGINT},
-      <if test="username != null">
-        #{username,jdbcType=VARCHAR},
-      </if>
-      <if test="loginame != null">
-        #{loginame,jdbcType=VARCHAR},
-      </if>
-      <if test="password != null">
-        #{password,jdbcType=VARCHAR},
-      </if>
-      <if test="position != null">
-        #{position,jdbcType=VARCHAR},
-      </if>
-      <if test="department != null">
-        #{department,jdbcType=VARCHAR},
-      </if>
-      <if test="email != null">
-        #{email,jdbcType=VARCHAR},
-      </if>
-      <if test="phonenum != null">
-        #{phonenum,jdbcType=VARCHAR},
-      </if>
-      <if test="ismanager != null">
-        #{ismanager,jdbcType=TINYINT},
-      </if>
-      <if test="isystem != null">
-        #{isystem,jdbcType=TINYINT},
-      </if>
-      <if test="status != null">
-        #{status,jdbcType=TINYINT},
-      </if>
-      <if test="description != null">
-        #{description,jdbcType=VARCHAR},
-      </if>
-      <if test="remark != null">
-        #{remark,jdbcType=VARCHAR},
-      </if>
-      <if test="tenantId != null">
-        #{tenantId,jdbcType=BIGINT},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.UserExample" resultType="java.lang.Integer">
-    select count(*) from jsh_user
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update jsh_user
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.username != null">
-        username = #{record.username,jdbcType=VARCHAR},
-      </if>
-      <if test="record.loginame != null">
-        loginame = #{record.loginame,jdbcType=VARCHAR},
-      </if>
-      <if test="record.password != null">
-        password = #{record.password,jdbcType=VARCHAR},
-      </if>
-      <if test="record.position != null">
-        position = #{record.position,jdbcType=VARCHAR},
-      </if>
-      <if test="record.department != null">
-        department = #{record.department,jdbcType=VARCHAR},
-      </if>
-      <if test="record.email != null">
-        email = #{record.email,jdbcType=VARCHAR},
-      </if>
-      <if test="record.phonenum != null">
-        phonenum = #{record.phonenum,jdbcType=VARCHAR},
-      </if>
-      <if test="record.ismanager != null">
-        ismanager = #{record.ismanager,jdbcType=TINYINT},
-      </if>
-      <if test="record.isystem != null">
-        isystem = #{record.isystem,jdbcType=TINYINT},
-      </if>
-      <if test="record.status != null">
-        Status = #{record.status,jdbcType=TINYINT},
-      </if>
-      <if test="record.description != null">
-        description = #{record.description,jdbcType=VARCHAR},
-      </if>
-      <if test="record.remark != null">
-        remark = #{record.remark,jdbcType=VARCHAR},
-      </if>
-      <if test="record.tenantId != null">
-        tenant_id = #{record.tenantId,jdbcType=BIGINT},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update jsh_user
-    set id = #{record.id,jdbcType=BIGINT},
-      username = #{record.username,jdbcType=VARCHAR},
-      loginame = #{record.loginame,jdbcType=VARCHAR},
-      password = #{record.password,jdbcType=VARCHAR},
-      position = #{record.position,jdbcType=VARCHAR},
-      department = #{record.department,jdbcType=VARCHAR},
-      email = #{record.email,jdbcType=VARCHAR},
-      phonenum = #{record.phonenum,jdbcType=VARCHAR},
-      ismanager = #{record.ismanager,jdbcType=TINYINT},
-      isystem = #{record.isystem,jdbcType=TINYINT},
-      Status = #{record.status,jdbcType=TINYINT},
-      description = #{record.description,jdbcType=VARCHAR},
-      remark = #{record.remark,jdbcType=VARCHAR},
-      tenant_id = #{record.tenantId,jdbcType=BIGINT}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.User">
-    update jsh_user
-    <set>
-      <if test="username != null">
-        username = #{username,jdbcType=VARCHAR},
-      </if>
-      <if test="loginame != null">
-        loginame = #{loginame,jdbcType=VARCHAR},
-      </if>
-      <if test="password != null">
-        password = #{password,jdbcType=VARCHAR},
-      </if>
-      <if test="position != null">
-        position = #{position,jdbcType=VARCHAR},
-      </if>
-      <if test="department != null">
-        department = #{department,jdbcType=VARCHAR},
-      </if>
-      <if test="email != null">
-        email = #{email,jdbcType=VARCHAR},
-      </if>
-      <if test="phonenum != null">
-        phonenum = #{phonenum,jdbcType=VARCHAR},
-      </if>
-      <if test="ismanager != null">
-        ismanager = #{ismanager,jdbcType=TINYINT},
-      </if>
-      <if test="isystem != null">
-        isystem = #{isystem,jdbcType=TINYINT},
-      </if>
-      <if test="status != null">
-        Status = #{status,jdbcType=TINYINT},
-      </if>
-      <if test="description != null">
-        description = #{description,jdbcType=VARCHAR},
-      </if>
-      <if test="remark != null">
-        remark = #{remark,jdbcType=VARCHAR},
-      </if>
-      <if test="tenantId != null">
-        tenant_id = #{tenantId,jdbcType=BIGINT},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.User">
-    update jsh_user
-    set username = #{username,jdbcType=VARCHAR},
-      loginame = #{loginame,jdbcType=VARCHAR},
-      password = #{password,jdbcType=VARCHAR},
-      position = #{position,jdbcType=VARCHAR},
-      department = #{department,jdbcType=VARCHAR},
-      email = #{email,jdbcType=VARCHAR},
-      phonenum = #{phonenum,jdbcType=VARCHAR},
-      ismanager = #{ismanager,jdbcType=TINYINT},
-      isystem = #{isystem,jdbcType=TINYINT},
-      Status = #{status,jdbcType=TINYINT},
-      description = #{description,jdbcType=VARCHAR},
-      remark = #{remark,jdbcType=VARCHAR},
-      tenant_id = #{tenantId,jdbcType=BIGINT}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
+<mapper namespace="com.jsh.erp.datasource.mappers.UserMapper">
+  <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.User">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="username" jdbcType="VARCHAR" property="username" />
+    <result column="loginame" jdbcType="VARCHAR" property="loginame" />
+    <result column="password" jdbcType="VARCHAR" property="password" />
+    <result column="position" jdbcType="VARCHAR" property="position" />
+    <result column="department" jdbcType="VARCHAR" property="department" />
+    <result column="email" jdbcType="VARCHAR" property="email" />
+    <result column="phonenum" jdbcType="VARCHAR" property="phonenum" />
+    <result column="ismanager" jdbcType="TINYINT" property="ismanager" />
+    <result column="isystem" jdbcType="TINYINT" property="isystem" />
+    <result column="Status" jdbcType="TINYINT" property="status" />
+    <result column="description" jdbcType="VARCHAR" property="description" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, username, loginame, password, position, department, email, phonenum, ismanager, 
+    isystem, Status, description, remark, tenant_id
+  </sql>
+  <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.UserExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from jsh_user
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from jsh_user
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from jsh_user
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.UserExample">
+    delete from jsh_user
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.jsh.erp.datasource.entities.User">
+    insert into jsh_user (id, username, loginame, 
+      password, position, department, 
+      email, phonenum, ismanager, 
+      isystem, Status, description, 
+      remark, tenant_id)
+    values (#{id,jdbcType=BIGINT}, #{username,jdbcType=VARCHAR}, #{loginame,jdbcType=VARCHAR}, 
+      #{password,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR}, #{department,jdbcType=VARCHAR}, 
+      #{email,jdbcType=VARCHAR}, #{phonenum,jdbcType=VARCHAR}, #{ismanager,jdbcType=TINYINT}, 
+      #{isystem,jdbcType=TINYINT}, #{status,jdbcType=TINYINT}, #{description,jdbcType=VARCHAR}, 
+      #{remark,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT})
+  </insert>
+  <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.User">
+    insert into jsh_user
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="username != null">
+        username,
+      </if>
+      <if test="loginame != null">
+        loginame,
+      </if>
+      <if test="password != null">
+        password,
+      </if>
+      <if test="position != null">
+        position,
+      </if>
+      <if test="department != null">
+        department,
+      </if>
+      <if test="email != null">
+        email,
+      </if>
+      <if test="phonenum != null">
+        phonenum,
+      </if>
+      <if test="ismanager != null">
+        ismanager,
+      </if>
+      <if test="isystem != null">
+        isystem,
+      </if>
+      <if test="status != null">
+        Status,
+      </if>
+      <if test="description != null">
+        description,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="tenantId != null">
+        tenant_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="username != null">
+        #{username,jdbcType=VARCHAR},
+      </if>
+      <if test="loginame != null">
+        #{loginame,jdbcType=VARCHAR},
+      </if>
+      <if test="password != null">
+        #{password,jdbcType=VARCHAR},
+      </if>
+      <if test="position != null">
+        #{position,jdbcType=VARCHAR},
+      </if>
+      <if test="department != null">
+        #{department,jdbcType=VARCHAR},
+      </if>
+      <if test="email != null">
+        #{email,jdbcType=VARCHAR},
+      </if>
+      <if test="phonenum != null">
+        #{phonenum,jdbcType=VARCHAR},
+      </if>
+      <if test="ismanager != null">
+        #{ismanager,jdbcType=TINYINT},
+      </if>
+      <if test="isystem != null">
+        #{isystem,jdbcType=TINYINT},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=TINYINT},
+      </if>
+      <if test="description != null">
+        #{description,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="tenantId != null">
+        #{tenantId,jdbcType=BIGINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.UserExample" resultType="java.lang.Long">
+    select count(*) from jsh_user
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update jsh_user
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.username != null">
+        username = #{record.username,jdbcType=VARCHAR},
+      </if>
+      <if test="record.loginame != null">
+        loginame = #{record.loginame,jdbcType=VARCHAR},
+      </if>
+      <if test="record.password != null">
+        password = #{record.password,jdbcType=VARCHAR},
+      </if>
+      <if test="record.position != null">
+        position = #{record.position,jdbcType=VARCHAR},
+      </if>
+      <if test="record.department != null">
+        department = #{record.department,jdbcType=VARCHAR},
+      </if>
+      <if test="record.email != null">
+        email = #{record.email,jdbcType=VARCHAR},
+      </if>
+      <if test="record.phonenum != null">
+        phonenum = #{record.phonenum,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ismanager != null">
+        ismanager = #{record.ismanager,jdbcType=TINYINT},
+      </if>
+      <if test="record.isystem != null">
+        isystem = #{record.isystem,jdbcType=TINYINT},
+      </if>
+      <if test="record.status != null">
+        Status = #{record.status,jdbcType=TINYINT},
+      </if>
+      <if test="record.description != null">
+        description = #{record.description,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.tenantId != null">
+        tenant_id = #{record.tenantId,jdbcType=BIGINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update jsh_user
+    set id = #{record.id,jdbcType=BIGINT},
+      username = #{record.username,jdbcType=VARCHAR},
+      loginame = #{record.loginame,jdbcType=VARCHAR},
+      password = #{record.password,jdbcType=VARCHAR},
+      position = #{record.position,jdbcType=VARCHAR},
+      department = #{record.department,jdbcType=VARCHAR},
+      email = #{record.email,jdbcType=VARCHAR},
+      phonenum = #{record.phonenum,jdbcType=VARCHAR},
+      ismanager = #{record.ismanager,jdbcType=TINYINT},
+      isystem = #{record.isystem,jdbcType=TINYINT},
+      Status = #{record.status,jdbcType=TINYINT},
+      description = #{record.description,jdbcType=VARCHAR},
+      remark = #{record.remark,jdbcType=VARCHAR},
+      tenant_id = #{record.tenantId,jdbcType=BIGINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.User">
+    update jsh_user
+    <set>
+      <if test="username != null">
+        username = #{username,jdbcType=VARCHAR},
+      </if>
+      <if test="loginame != null">
+        loginame = #{loginame,jdbcType=VARCHAR},
+      </if>
+      <if test="password != null">
+        password = #{password,jdbcType=VARCHAR},
+      </if>
+      <if test="position != null">
+        position = #{position,jdbcType=VARCHAR},
+      </if>
+      <if test="department != null">
+        department = #{department,jdbcType=VARCHAR},
+      </if>
+      <if test="email != null">
+        email = #{email,jdbcType=VARCHAR},
+      </if>
+      <if test="phonenum != null">
+        phonenum = #{phonenum,jdbcType=VARCHAR},
+      </if>
+      <if test="ismanager != null">
+        ismanager = #{ismanager,jdbcType=TINYINT},
+      </if>
+      <if test="isystem != null">
+        isystem = #{isystem,jdbcType=TINYINT},
+      </if>
+      <if test="status != null">
+        Status = #{status,jdbcType=TINYINT},
+      </if>
+      <if test="description != null">
+        description = #{description,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="tenantId != null">
+        tenant_id = #{tenantId,jdbcType=BIGINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.User">
+    update jsh_user
+    set username = #{username,jdbcType=VARCHAR},
+      loginame = #{loginame,jdbcType=VARCHAR},
+      password = #{password,jdbcType=VARCHAR},
+      position = #{position,jdbcType=VARCHAR},
+      department = #{department,jdbcType=VARCHAR},
+      email = #{email,jdbcType=VARCHAR},
+      phonenum = #{phonenum,jdbcType=VARCHAR},
+      ismanager = #{ismanager,jdbcType=TINYINT},
+      isystem = #{isystem,jdbcType=TINYINT},
+      Status = #{status,jdbcType=TINYINT},
+      description = #{description,jdbcType=VARCHAR},
+      remark = #{remark,jdbcType=VARCHAR},
+      tenant_id = #{tenantId,jdbcType=BIGINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
 </mapper>
\ No newline at end of file
diff --git a/src/test/resources/generatorConfig.xml b/src/test/resources/generatorConfig.xml
index 7972bf64..7d8d14a7 100644
--- a/src/test/resources/generatorConfig.xml
+++ b/src/test/resources/generatorConfig.xml
@@ -37,7 +37,7 @@
         <!-- generate Mapper -->
         <javaClientGenerator type="XMLMAPPER"
                              targetPackage="com.jsh.erp.datasource.mappers"
-                             targetProject="src\main\java" implementationPackage="">
+                             targetProject="src\main\java">
             <property name="enableSubPackages" value="false"/>
             <property name="exampleMethodVisibility" value="public"/>
         </javaClientGenerator>
@@ -45,9 +45,7 @@
         <table tableName="jsh_accounthead" domainObjectName="AccountHead"></table>
         <table tableName="jsh_accountitem" domainObjectName="AccountItem"></table>
         <table tableName="jsh_depot" domainObjectName="Depot"></table>
-        <table tableName="jsh_depothead" domainObjectName="DepotHead">
-            <generatedKey column="id" sqlStatement="SELECT LAST_INSERT_ID()"/>
-        </table>
+        <table tableName="jsh_depothead" domainObjectName="DepotHead"></table>
         <table tableName="jsh_depotitem" domainObjectName="DepotItem"></table>
         <table tableName="jsh_functions" domainObjectName="Functions"></table>
         <table tableName="jsh_inoutitem" domainObjectName="InOutItem"></table>
@@ -61,9 +59,7 @@
         <table tableName="jsh_supplier" domainObjectName="Supplier"></table>
         <table tableName="jsh_systemconfig" domainObjectName="SystemConfig"></table>
         <table tableName="jsh_unit" domainObjectName="Unit"></table>
-        <table tableName="jsh_user" domainObjectName="User">
-            <generatedKey column="id" sqlStatement="SELECT LAST_INSERT_ID()"/>
-        </table>
+        <table tableName="jsh_user" domainObjectName="User"></table>
         <table tableName="jsh_userbusiness" domainObjectName="UserBusiness"></table>
         <table tableName="jsh_serial_number" domainObjectName="SerialNumber"></table>
         <table tableName="jsh_organization" domainObjectName="Organization"></table>