Merge branch 'dev-0327' into dev

luofl

2025-03-31 70c212447a330daf9d707d1cb4aa9fd66d732579

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java

@@ -149,7 +149,7 @@
            houseMapDistributionVO.setLongitude(house.getLongitude());
            houseMapDistributionVO.setLatitude(house.getLatitude());
            TContract contract = contractService.getOne(new LambdaQueryWrapper<TContract>()
                    .gt(TContract::getEndTime, LocalDateTime.now())
                    .gt(TContract::getEndTime, LocalDate.now())
                    .eq(TContract::getHouseId, house.getId())
                    .eq(TContract::getStatus, 4)
                    .last("limit 1"));