Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop

qushaowei

2024-03-28 1a2258c4eca2e7514b6096004fa1c3e0036b402b

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/StreamServiceImpl.java

@@ -49,7 +49,7 @@

   @Override
   public Page<Stream> myPage(Page<Stream> page, Stream stream) {
      return page.setRecords(baseMapper.myPage(page,stream.getAreaId()));
      return page.setRecords(baseMapper.myPage(page,stream.getAreaId(),stream.getNum()));
   }