<<<<<<< HEAD ======= >>>>>>> 2bf272a9d41a2b6c67910b23371af9537a9153a5 <<<<<<< HEAD ======= >>>>>>> 2bf272a9d41a2b6c67910b23371af9537a9153a5 <<<<<<< HEAD select a.id as id, a.product_name, 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, a.type_id as type_id, bgt.type_name from product as a left join basic_glass_type bgt on bgt.type_id = a.type_id and a.type_id regexp #{glassTypeId} and a.id regexp #{product.id} and a.product_name regexp #{product.productName} and bgt.type_name regexp #{product.basicGlassType.typeName} and a.query regexp #{product.query} and a.creator regexp #{product.creator} and date(a.create_time) regexp #{product.createTime} ======= 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} ;