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

guoyuji

2024-01-23 a6c70be014537e9b5ed48e68edaf3a1a94cb1ac7

 north-glass-erp/src/main/java/com/example/erp/mapper/sd/ProductMapper.java

@@ -8,5 +8,10 @@

@Mapper
public interface ProductMapper {
    List<Product> defaultProduct(@Param("offset") Integer offset, @Param("pageSize") Integer pageSize);
    List<Product> defaultProduct(@Param("offset") Integer offset,
                                 @Param("pageSize") Integer pageSiz,
                                 @Param("glassTypeId") String glassTypeId,
                                 @Param("product") Product product);

    Integer getPageTotal(Integer offset, Integer pageSize, String glassTypeId, Product product);
}