Merge branch '20220609' into 'master'

fix(DEFECT-422): 告警记录排序

See merge request huang/thingsboard3.3.2!106

@@ -44,7 +44,7 @@ public class YtAlarmInfoServiceImpl implements YtAlarmInfoService {
 
     @Override
     public YtPageData<YtAlarmEntity> alarmPage(Map<String, Object> pageMap, TenantId tenantId, UUID customerId, AlarmSeverity severity, String alarmType, Long startTime, Long endTime, List<AlarmStatus> status, String deviceId, DeviceTypeEnum deviceType, EntityType originatorType, String organizationId) {
-        IPage<YtAlarmEntity> page = getPage(pageMap, ModelConstants.STATUS_PROPERTY, OrderTypeEnum.ASC);
+        IPage<YtAlarmEntity> page = getPage(pageMap, ModelConstants.STATUS_PROPERTY+","+ModelConstants.CREATED_TIME_PROPERTY, OrderTypeEnum.ASC);
         List<String> ids = new ArrayList<>();
         if (StringUtils.isNotBlank(organizationId)) {
             List<String> filter = new ArrayList<>();