Merge remote-tracking branch 'origin/master'

李宇

2021-11-12 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa

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

@@ -33,7 +33,7 @@

   void reagentDStore3(List<OpeApply> reagentDStoreList, String loginUserId);

   void reagentDStore4(List<OpeApply> reagentDStoreList, String loginUserId);
   void reagentDStore4(List<OpeApply> reagentDStoreList, String loginUserId,String receiptNumber);

   public List<OpeWarehouseReserve> selectByReId(String id);
   public void updateByReId(String newReId,String oldReId);