ERP_override.git

			@@ -5,7 +5,11 @@
			<mapper namespace="com.example.erp.mapper.sd.ProductMapper">
			<resultMap id="productmap" type="com.example.erp.entity.sd.Product" >
			<id column="id" property="id"/>
			<<<<<<< HEAD
			<result column="product_name" property="productName"/>
			=======
			<result column="product" property="product"/>
			>>>>>>> 2bf272a9d41a2b6c67910b23371af9537a9153a5
			<result column="total_thickness" property="totalThickness"/>
			<result column="thickness" property="thickness"/>
			<result column="query" property="query"/>
			@@ -14,8 +18,13 @@
			<result column="creator" property="creator"/>
			<result column="create_time" property="createTime"/>
			<result column="update_time" property="updateTime"/>
			<<<<<<< HEAD
			<association property="basicGlassType" javaType="com.example.erp.entity.sd.BasicGlassType">
			<result column="type_id" property="typeID"/>
			=======
			<association property="glassType" javaType="com.example.erp.entity.sd.GlassType">
			<result column="type_id" property="typeId"/>
			>>>>>>> 2bf272a9d41a2b6c67910b23371af9537a9153a5
			<result column="type_name" property="typeName"/>
			</association>
			<!--<result column="g_typeId" property="glassTypes.typeId"/>
			@@ -24,6 +33,7 @@
			</resultMap>

			<select id="defaultProduct" resultMap="productmap">
			<<<<<<< HEAD
			select a.id as id,
			a.product_name,
			a.total_thickness,
			@@ -61,6 +71,22 @@
			and date(a.create_time) regexp #{product.createTime}
			</if>
			</where>
			=======
			select a.id as id,
			a.product,
			a.total_thickness,
			a.thickness,
			a.query,
			a.remarks,
			a.state,
			a.creator,
			date(a.create_time) as create_time,
			a.update_time as update_time,
			bgt.type_id as type_id,
			bgt.type as type
			from product as a
			left join glass_type bgt on bgt.type_id = a.type_id
			>>>>>>> 2bf272a9d41a2b6c67910b23371af9537a9153a5

			order by id desc
			limit #{offset},#{pageSize}