Merge remote-tracking branch 'origin/master'

zss

2023-09-25 5d24aead2d1a45452942ddfc300fe6a232301a99

 inventory-server/src/main/java/com/yuanchu/mom/mapper/RepertoryMapper.java

@@ -18,7 +18,7 @@
public interface RepertoryMapper extends BaseMapper<Repertory> {

    //查询所有库存列表
    IPage<Map<String, Object>> selectAllRepertory(Page<Object> page, String name, String specifications, String time, Integer type,Integer result);
    IPage<Map<String, Object>> selectAllRepertory(Page<Object> page, String name, String specifications, String time, Integer type);

}