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

lyfO_o

2021-10-21 ab570b8dd8e9fe5c154a3f34129639636078b2a6

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

@@ -13,4 +13,6 @@

    public List getSupplierList(Map params);
    public int updateDestoryFlagById(SupplierOrder supplierOrder);

    SupplierOrder selectById(String id);
}