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

lyfO_o

2021-10-27 ea2b42d0ab6cd96118ddb030bbc3901149d6aaa7

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

@@ -170,6 +170,7 @@
      printTable.put("project", selectOne.getProject());
      SysLaboratory sysLaboratory = sysLaboratoryService.getSysLaboratory(selectOne.getHouseId());
      printTable.put("lab", sysLaboratory.getName());
      printTable.put("note",selectOne.getNote() == null?"":selectOne.getNote());
      //整理数据
      List<PersonUseDetail> applyInfo = opeUseFlowService.getApplyInfo(selectOne.getReceiptNumber());
      assert applyInfo.size() > 0;