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

gdg

2021-02-01 1cbac7aa20a183a9a893651bf0cef24b1909eb5c

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

@@ -48,10 +48,12 @@

    void updateReceiptNumberByCode2(List<OpeWarehouseReserve> codeTmp, String receiptNumber);

   int getPersonalUseInfoCount(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, String department, String project);
   int getPersonalUseInfoCount(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, String department, String project,String applyPerson,String reagentName);

   List<OpeUseFlow> getPersonalUseInfoList(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, String department, String project, int first, int pageSize);
   List<OpeUseFlow> getPersonalUseInfoList(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, String department, String project,String applyPerson,String reagentName, int first, int pageSize);

    List<PersonUseDetail> getApplyInfo(String receiptNumber);

   int getApplyInfoSize(String receiptNumber);

}