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

gdg

2021-02-01 1cbac7aa20a183a9a893651bf0cef24b1909eb5c

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

@@ -55,9 +55,9 @@
   int getOpeApplyReserveTotalCountByName(String id,String reagentName, String personName);
   List<OpeApplyReserve> getOpeApplyReserveListByName(String id,String reagentName, String personName, Integer first,
         Integer pageSize);
    int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status);
    int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status,Integer isAllApply);
    List<OpeApplyReserve> getOpeApplyReserveListByNameFor(String id,String reagentName, String personName, Integer first,
                                                       Integer pageSize,String productSn,String applyCode,Integer status);
                                                       Integer pageSize,String productSn,String applyCode,Integer status,Integer isAllApply);
   public boolean updaetOpeApplyPrice(BigDecimal applyPrice,String id);
   public boolean updaetOpeApplyStockFlag(int stockFlag,String id);
   public boolean cancelApply(ApplyStatus status,String id);