Merge branch 'dev-lx' into 'dev'

Dev lx

See merge request !7

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

@@ -6,6 +6,8 @@ import com.ruoyi.system.service.house.HouseResourceAssociationObjectService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.UUID;
+
 @Service
 public class HouseResourceAssociationObjectServiceImpl implements HouseResourceAssociationObjectService {
 
@@ -18,6 +20,7 @@ public class HouseResourceAssociationObjectServiceImpl implements HouseResourceA
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void saveHouseResourceAssociationObject(HouseResourceAssociationObject houseResourceAssociationObject) {
+        houseResourceAssociationObject.setId(UUID.randomUUID().toString().replaceAll("-", ""));
         houseResourceAssociationObjectMapper.insertHouseResourceObjectAssociation(houseResourceAssociationObject);
     }