Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang

 Conflicts:

	ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductTypeMapper.java

ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductTypeMapper.xml

@@ -1,5 +1,75 @@
 <?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.cnbm.generator.code.mapper.ProductTypeMapper">
+<mapper namespace="com.cnbm.basic.mapper.ProductTypeMapper">
+    <sql id="Base_Column_List">
+            id,
+            `name`,
+            code,
+            descs,
+            `status`,
+            remark,
+            `valid`,
+            creator_id,
+            creator_name,
+            create_time,
+            updater_id,
+            updater_name,
+            update_time,
+            version
+    </sql>
+    <resultMap id="BaseResultMap" type="com.cnbm.basic.entity.ProductType">
+        <result column="id" property="id"/>
+        <result column="name" property="name"/>
+        <result column="code" property="code"/>
+        <result column="descs" property="descs"/>
+        <result column="status" property="status"/>
+        <result column="remark" property="remark"/>
+        <result column="valid" property="valid"/>
+        <result column="creator_id" property="creatorId"/>
+        <result column="creator_name" property="creatorName"/>
+        <result column="create_time" property="createTime"/>
+        <result column="updater_id" property="updaterId"/>
+        <result column="updater_name" property="updaterName"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="version" property="version"/>
+    </resultMap>
+
+<!--auto generated by MybatisCodeHelper on 2022-07-05-->
+    <insert id="insertList">
+        INSERT INTO product_type(
+        id,
+        name,
+        code,
+        descs,
+        status,
+        remark,
+        valid,
+        creator_id,
+        creator_name,
+        create_time,
+        updater_id,
+        updater_name,
+        update_time,
+        version
+        )VALUES
+        <foreach collection="list" item="element" index="index" separator=",">
+            (
+            #{element.id},
+            #{element.name},
+            #{element.code},
+            #{element.descs},
+            #{element.status},
+            #{element.remark},
+            #{element.valid},
+            #{element.creatorId},
+            #{element.creatorName},
+            #{element.createTime},
+            #{element.updaterId},
+            #{element.updaterName},
+            #{element.updateTime},
+            #{element.version}
+            )
+        </foreach>
+    </insert>
 
 </mapper>

ym-baisc/src/main/java/com/cnbm/basic/mapper/UnitMapper.xml

@@ -1,5 +1,5 @@
 <?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.cnbm.generator.code.mapper.UnitMapper">
+<mapper namespace="com.cnbm.basic.mapper.UnitMapper">
 
 </mapper>