Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-26 179b7b6c557eec27f5a05ee7ed2981f14825b692

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

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

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


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

    InspectionVo selectRawmaById(Integer id);

}