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

chenlu

2025-07-09 ff195859283806241f3cb40e33170dd77a7eed61

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