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

c74dd9b0 · huangjy · c873e96f · f74f7920 · c74dd9b0
Commit c74dd9b0 authored Nov 30, 2023 by huangjy
Showing with 1 additions and 1 deletions
server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java
--- a/server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java
+++ b/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