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

gdg

2021-01-18 3ec412f3cdc8b114cf629e866a7b7b80687a3442

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

@@ -33,4 +33,8 @@

    public List<EmailStatus> selectByReId(String id);
    public void updateByReId(String newReId,String oldReId);

    OpeOrder getOrder(String id);

    void updateOpeOrderStatus(OpeOrder oo);
}