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

lyfO_o

2021-10-27 ea2b42d0ab6cd96118ddb030bbc3901149d6aaa7

 src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.java

@@ -5,6 +5,7 @@
import com.nanometer.smartlab.entity.OpeOrder;
import com.nanometer.smartlab.entity.OpeWarehouseReserve;

import org.apache.ibatis.annotations.Param;
import org.springframework.dao.DataAccessException;

import java.util.List;
@@ -55,4 +56,11 @@
    OpeApplyReserve getOpeApplyDetail(String id);

    void updateOpeApplyInfo(Map params);

    void insertList(List<OpeApply> opeApplyList);

    OpeApplyReserve getOpeApplyReserveListByNameForRowData(@Param("id") String rowKey);

    List<Map> getApplyControlInfo();

}