Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2024-07-08 4c368a7d1f0bb452b4cbb063a86701b571a01a95

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

@@ -47,7 +47,7 @@
                and a.type_id like concat('%',#{glassTypeId},'%')
            </if>
            <if test="product.id != null and product.id != ''">
                and a.id like like concat('%',#{product.id},'%')
                and a.id like concat('%',#{product.id},'%')
            </if>
            <if test="product.productName != null and product.productName != ''">
                and a.product_name like concat('%',#{product.productName},'%')