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

chenlu

9 天以前 97fba4a0e38c0b8455d43d2935aa996676407361

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

@@ -12,7 +12,7 @@
    List<Product> defaultProduct(@Param("offset") Integer offset,
                                 @Param("pageSize") Integer pageSiz,
                                 @Param("glassTypeId") String glassTypeId,
                                 @Param("product") Product product);
                                 @Param("product") Product product,String field, String orderBy);

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