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

guoyuji

2024-12-05 26aa014b40fa80905990997bc848db975861c916

 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);

    List<MaterialStore> getSelectMaterialStores(@Param("materialStore") MaterialStore materialStore);

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