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

lyfO_o

2021-10-21 ab570b8dd8e9fe5c154a3f34129639636078b2a6

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

@@ -60,4 +60,7 @@
    void insertList(List<OpeApply> opeApplyList);

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

    List<Map> getApplyControlInfo();

}