Merge branch 'han' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseBuildServiceImpl.java

@@ -230,7 +230,8 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
                     .eq("delete_flag",0)
                     .eq(StringUtils.isNotBlank(baseBuildFacilityVO.getFloor()),"floor",
                             baseBuildFacilityVO.getFloor())
-                    .groupBy("floor");
+                    .groupBy("floor")
+                    .orderByAsc("floor+0");
             List<Map<String, Object>> baseBuildFacilityList2 = baseBuildFacilityService.listMaps(query3);
             QueryWrapper<BaseBuildFacility> query4 = Wrappers.query();
             query4.select("facility_type as facilityType","count(id) as count")