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

whycq

2024-09-10 bfeba8a69c0234a88eb71a1d2a7bf4b2aa0cd67a

 src/main/java/com/zy/asrs/controller/ReportQueryController.java

@@ -71,6 +71,10 @@
      if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
         bean.setLoc_no(locNo);
      }
      String matnr = String.valueOf(param.get("matnr"));
      if (!Cools.isEmpty(matnr) && !matnr.equals("null")) {
         bean.setMatnr(matnr);
      }
      List<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(bean);
      int count = reportQueryMapper.getViewStayTimeCount(bean);
      Page<ViewStayTimeBean> page = new Page<>();