Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

chenlu

2024-01-23 3ad02364ce97ab8188d18c52695c8b57b1e47ea6

 north-glass-erp/src/main/resources/mapper/sd/Product.xml

@@ -33,7 +33,6 @@
    </resultMap>

    <select id="defaultProduct" resultMap="productmap">
<<<<<<< HEAD
        select a.id as id,
        a.product_name,
        a.total_thickness,
@@ -71,22 +70,6 @@
                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}