Merge branch 'dev' into 'main'

Dev

See merge request !10

ruoyi-system/src/main/java/com/ruoyi/system/service/house/HouseResourceAssociationObjectService.java

@@ -10,7 +10,5 @@ public interface HouseResourceAssociationObjectService {
 
     void deleteHouseResourceAssociationObjectById(String id);
 
-    HouseResourceAssociationObject queryHouseResourceAssociationObjectById(String id);
-
     HouseResourceAssociationObject queryHouseResourceAssociationObjectByHouseResourceIdType(String houseResourceId, int type);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/house/impl/HouseResourceAssociationObjectServiceImpl.java

@@ -36,11 +36,6 @@ public class HouseResourceAssociationObjectServiceImpl implements HouseResourceA
         houseResourceAssociationObjectMapper.deleteHouseResourceObjectAssociationById(id);
     }
 
-    @Override
-    public HouseResourceAssociationObject queryHouseResourceAssociationObjectById(String id) {
-        return houseResourceAssociationObjectMapper.selectHouseResourceObjectAssociationById(id);
-    }
-
     @Override
     public HouseResourceAssociationObject queryHouseResourceAssociationObjectByHouseResourceIdType(String houseResourceId, int type) {
         return houseResourceAssociationObjectMapper.selectHouseResourceObjectAssociationByHouseResourceIdType(houseResourceId, type);