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

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java

@@ -101,7 +101,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         if (!CollectionUtils.isEmpty(noOpenBadge)){
             userBadgeListResultDTOS.addAll(noOpenBadge);
         }
-        return userBadgeListResultDTOS.stream().sorted(Comparator.comparing(UserBadgeListResultDTO::getIsOpened).reversed().thenComparing(UserBadgeListResultDTO::getUpdatedTime).reversed().thenComparing(UserBadgeListResultDTO::getSort)).collect(Collectors.toList());
+        return userBadgeListResultDTOS.stream().sorted(Comparator.comparing(UserBadgeListResultDTO::getIsOpened,Comparator.reverseOrder()).thenComparing(UserBadgeListResultDTO::getUpdatedTime,Comparator.reverseOrder()).thenComparing(UserBadgeListResultDTO::getSort)).collect(Collectors.toList());
     }
 
     /**