Merge remote-tracking branch 'origin/master'

value

2023-09-01 4800caf0bc511a26624da1b9a9cf34275b6c2c4a

 inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/RawMaterialMapper.java

@@ -4,7 +4,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.RawMaterial;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;
import java.util.Map;
import java.util.Objects;

@@ -18,5 +21,10 @@
 */
public interface RawMaterialMapper extends BaseMapper<RawMaterial> {

    IPage<RawMaterial> selectRawMaterial(String materialCoding, String materialName, String condition, String createTime, Page<Objects> page);
    IPage<RawMaterial> selectRawMaterial(String materialCoding, String materialName, Integer type, String createTime, Page<Objects> page);


    List<Map<String, Object>> selectRawmaAll();


}