Merge remote-tracking branch 'origin/master'

value

2023-08-30 19c9e29273e8e751847d9dcb06b346dede48d2c8

 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/RawMaterialService.java

@@ -22,14 +22,17 @@
 */
public interface RawMaterialService extends IService<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);

    /**
     * 查询原材料检验
     *
     * @return
     */
    List<RawMaterial> selectRawmaAll();
    List<Map<String, Object>> selectRawmaAll();


    Integer insertRawMaterial(RawMaterial rawMaterial);

    Integer deleteRawMaterial(String deleteId);
}