Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-07-26 0a62550520293dacf31c4cf0dd58735db066e2dd

 standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java

@@ -29,11 +29,13 @@
    @Resource
    MaterialMapper materialMapper;

    //查询物料信息
    @Override
    public List<Material> selectMaterialLimit(int pageSize, int countSize) {
        return materialMapper.selectMaterialLimit((pageSize - 1) * countSize,pageSize * countSize);
    }

    //根据物料id查询物料信息
    @Override
    public Map selectMaterialById(String materialId) {
        return materialMapper.selectMaterialById(materialId);