Skip to content

Y
yichengstreet-be
Commit 6620e1d5 authored by lixuan's avatar lixuan
Browse files
Options

Merge branch 'dev' into 'main' 

Dev

See merge request !176
parents c2a1038c 5dae4a0a
Pipeline #143555 failed with stages
      in 32 minutes and 41 seconds
      Hide whitespace changes
      Inline Side-by-side
      Showing with 2 additions and 0 deletions
      ruoyi-system/src/main/java/com/ruoyi/system/service/house/impl/HouseResourceServiceImpl.java
      View file @ 6620e1d5
      ...@@ -299,6 +299,8 @@ public class HouseResourceServiceImpl implements HouseResourceService { ...@@ -299,6 +299,8 @@ public class HouseResourceServiceImpl implements HouseResourceService {
      } }
      } }
      } }
      } else {
      result = list;
      } }
      if (CollectionUtils.isEmpty(result)) { if (CollectionUtils.isEmpty(result)) {
      return new PageBusinessEntityStatisticsDetail(); return new PageBusinessEntityStatisticsDetail();
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment