Merge remote-tracking branch 'origin/master' into master

lyfO_o

2021-10-21 ab570b8dd8e9fe5c154a3f34129639636078b2a6

 src/main/java/com/nanometer/smartlab/service/DangerousEncodeService.java

@@ -1,6 +1,7 @@
package com.nanometer.smartlab.service;

import com.nanometer.smartlab.entity.DangerousEncode;
import com.nanometer.smartlab.entity.DangerousEncodeVo;
import com.nanometer.smartlab.entity.SysUser;
import org.primefaces.event.FileUploadEvent;

@@ -26,4 +27,10 @@
    List<Map> exportList(DangerousEncode dangerousEncodeFilter);

    List<DangerousEncode> selectByCodeAndName(String reagentcode, String reagentname,String cas,String code);

    List<DangerousEncodeVo> selectByReagentName(String reagentname, String cas);

    DangerousEncode selectByName(String reagentname);

    DangerousEncode selectById(Long id);
}