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

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

@@ -949,9 +949,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
                 QueryWrapper<TaBuildingImg> buildingImgQueryWrapper = new QueryWrapper<>();
                 buildingImgQueryWrapper.eq("img_id", img.getImgId());
                 buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
-                buildingImgQueryWrapper.orderByAsc("order_no");
                 return taBuildingImgMapper.selectOne(buildingImgQueryWrapper);
-            }).collect(Collectors.toList());
+            }).sorted(Comparator.comparing(TaBuildingImg::getOrderNo)).collect(Collectors.toList());
 
             e.setBuildingImgList(buildingImag);