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

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/GroupActRankResultDTO.java

@@ -1,7 +1,6 @@
 package com.epmet.dataaggre.dto.resigroup.result;
 
 import com.epmet.commons.tools.constant.NumConstant;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -25,7 +24,7 @@ public class GroupActRankResultDTO implements Serializable {
     private String participateUserName;
     private List<GroupActRankDetailDTO> categoryList;
 
-    @JsonIgnore
+    // @JsonIgnore
     private Integer sortValue;
 
     public GroupActRankResultDTO() {

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSignInRecordDao.xml

@@ -25,6 +25,7 @@
         WHERE
             acr.DEL_FLAG = '0'
             AND acr.GROUP_ACT_ID = #{groupActId}
+            order by acr.CREATED_TIME desc
     </select>
 
     <select id="queryActSignInRecord" parameterType="map" resultType="com.epmet.modules.act.entity.ActSignInRecordEntity">