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

server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java

@@ -460,7 +460,7 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
                 .eq(StringUtils.isNotBlank(param.getStatus()), PlatDevice::getStatus, param.getStatus())
                 .like(StringUtils.isNotBlank(param.getProductName()), PlatDevice::getProductName, param.getProductName())
                 .eq(StringUtils.isNotBlank(param.getTenantId()), BaseBusEntity::getTenantId, param.getTenantId())
-                .orderByDesc(BaseEntity::getUpdateDate);
+                .orderByDesc(BaseEntity::getUpdateDate).orderByDesc(BaseEntity::getId);
     }
 
     @Override