Merge branch 'jwy' of http://47.100.114.196:3001/jwy/aeon_dashboard_back into zhc

dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml

@@ -13,7 +13,7 @@
         device_info.device_name,
         device_info.device_sn,
         type.device_category_id categoryId,
-        device_info.retain_alert,
+#         device_info.retain_alert,
         device_info.monitoring_point_name,
         basic_asset_class_big.id monitoringPointCategoryId,
         basic_asset_class_big.class_name as monitoringPointCategoryName,

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/data/DeviceBaStatusData.java

@@ -29,7 +29,7 @@ public class DeviceBaStatusData extends BaseData{
     @Schema(description = "stop/running: 0-停止, 1-运行", example = "1")
     private Integer stopRun;
 
-    @Schema(description = "last stop time", example = "1720000000000", hidden = true)
+    @Schema(description = "", example = "1720000000000", hidden = true)
     private String latestTs;
 
 }