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

gdg

2021-02-02 529173267b4e7b4b296e92a8c8705e0da5180c89

 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);
}