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

gdg

2021-01-26 78ea95ba31e63279b46d47c5c9ca983f3e0c8d47

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

@@ -51,4 +51,8 @@
    public int updateByReId(Map params);

    List<String> selectReagentCodesByReId(String reagentId);

    void insertOpeReagentStatus2(OpeReagentStatus ors);

    int countReagentByArticleAndWarehouse(Map params);
}