Merge branch 'master' of https://gitee.com/xiaochen991015/xizang

xuhy

2025-04-02 8cd5154f68bc0302ea25aa6b84a3b3786d855504

 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"));