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

gdg

2021-01-26 78ea95ba31e63279b46d47c5c9ca983f3e0c8d47

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

@@ -478,4 +478,15 @@
        this.emailStatusDao.updateByReId(params);
    }

    @Override
    public OpeOrder getOrder(String id) {
        return opeOrderDao.selectParentOrder(id);
    }

    @Override
    @Transactional
    public void updateOpeOrderStatus(OpeOrder oo) {
        opeOrderDao.updateOpeOrderStatus(oo);
    }

}