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

guoyuji

2024-07-03 b74d3f3e8cfece410031916d18b9ebccb0aba731

 north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialStoreMapper.java

@@ -18,6 +18,8 @@
                                     @Param("pageSize") Integer pageSize,
                                     @Param("materialStore") MaterialStore materialStore);

    MaterialStore getSelectMaterialStoreById(@Param("id") Long id);


    Map<String,Integer> getSelectMaterialStorePageTotal(Integer offset, Integer pageSize, MaterialStore materialStore);