fix: CommonEntity

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/app/service/AppDeviceService.java

@@ -123,7 +123,7 @@ public class AppDeviceService {
                 // 取第一个子设备的数据来填充主体设备的电池电量和插电状态等信息
                 if (!appDevice.getChildren().isEmpty()) {
                     AppDeviceData firstChild = appDevice.getChildren().get(0);
-                    if (Objects.isNull(firstChild)) {
+                    if (Objects.nonNull(firstChild)) {
                         appDevice.setPlugInStatus(firstChild.getPlugInStatus());
                         appDevice.setBatteryPercentage(firstChild.getBatteryPercentage());
                         appDevice.setUpdateTime(firstChild.getTimestamp());

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitordevice/entity/MonitorDevice.java

@@ -93,42 +93,6 @@ public class MonitorDevice  extends CommonEntity {
     @Schema(description = "排序码")
     private Integer sortCode;
 
-    /**
-     * 扩展信息
-     */
-    @Schema(description = "扩展信息")
-    private String extraInfo;
-
-    /**
-     * 删除标志
-     */
-    @Schema(description = "删除标志")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @Schema(description = "记录创建时间")
-    private Date createdAt;
-
-    /**
-     * 记录创建用户
-     */
-    @Schema(description = "记录创建用户")
-    private String createdBy;
-
-    /**
-     * 记录修改时间
-     */
-    @Schema(description = "记录修改时间")
-    private Date updatedAt;
-
-    /**
-     * 记录修改用户
-     */
-    @Schema(description = "记录修改用户")
-    private String updatedBy;
-
     /**
      * 设备参数编号信息
      */

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitordevice/service/impl/MonitorDeviceServiceImpl.java

@@ -186,7 +186,7 @@ public class MonitorDeviceServiceImpl extends ServiceImpl<MonitorDeviceMapper, M
         LambdaQueryWrapper<MonitorDevice> queryWrapper = new LambdaQueryWrapper<>();
         if (!isAll) {
             queryWrapper.eq(MonitorDevice::getStatus, MonitorDeviceStatusEnum.NORMAL.getValue())
-                    .orderByDesc(MonitorDevice::getCreatedAt);
+                    .orderByAsc(MonitorDevice::getSortCode);
         }
         return list(queryWrapper);
     }