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

gdg

2021-01-26 78ea95ba31e63279b46d47c5c9ca983f3e0c8d47

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

@@ -2,6 +2,7 @@

import com.nanometer.smartlab.entity.OpeApply;
import com.nanometer.smartlab.entity.OpeApplyReserve;
import com.nanometer.smartlab.entity.OpeOrder;
import com.nanometer.smartlab.entity.OpeWarehouseReserve;

import org.springframework.dao.DataAccessException;
@@ -50,4 +51,8 @@

    List<OpeApply> selectByReId(String id);
    public int updateByReId(Map params);

    OpeApplyReserve getOpeApplyDetail(String id);

    void updateOpeApplyInfo(Map params);
}