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

mitao

2025-04-03 534acb09313afcb005543ab83028985a7075eeef

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/THouseServiceImpl.java

@@ -54,7 +54,12 @@
                tHouse.setLeaseStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_LEASE_STATUS,"2"));

            }else{
                if (tHouse.getLeaseStatus().equals("3")){
                tHouse.setLeaseStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_LEASE_STATUS,tHouse.getLeaseStatus()));
                }else{
                    tHouse.setLeaseStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_LEASE_STATUS,"1"));

                }
            }

        }