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

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TDBigScreenAnalyseController.java

@@ -334,6 +334,7 @@ public class TDBigScreenAnalyseController extends BaseController implements Appl
 				LambdaQueryWrapper<PvHealthIndex> pvwrapper = new LambdaQueryWrapper<PvHealthIndex>();
 				pvwrapper.eq(PvHealthIndex::getAnalysisObjType, "场站").and(
 						qw->qw.eq(PvHealthIndex::getGatewayId, fanGatewayId).or().eq(PvHealthIndex::getGatewayId, syzGatewayId));
+				pvwrapper.eq(PvHealthIndex::getAnalysisType, "按10分钟");
 				pvwrapper.orderByDesc(PvHealthIndex::getTs);
 				pvwrapper.last("limit 15");
 				List<PvHealthIndex> pvHealthIndexList = pvHealthIndexMapper.selectList(pvwrapper);