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

lyfO_o

2021-06-16 b510b274d9003d0a643a43c1e01b1382d84f78ec

 src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java

@@ -534,7 +534,7 @@
                        int count = sysReagentService.reagentCount(getUser(), applyNewReagentName, applyNewCas, null, applyNewSn);
                        this.setRowCount(count);
                        if (count > 0) {
                            list = sysReagentService.reagentList(getUser(), applyNewReagentName, applyNewCas, null, applyNewSn, first, pageSize);
                            list = sysReagentService.reagentList(getUser(), applyNewReagentName, applyNewCas, null, applyNewSn, first, pageSize,count);
                        }
                    } catch (Exception e) {
                        logger.error(e);