Merge branch 'pre' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot into pre

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserMockSubscribeServiceImpl.java

@@ -320,8 +320,18 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
                     userMockSubscribeVos.add(userMockSubscribeVo);
                 });
             }
-
         }
+
+        Collections.sort(userMockSubscribeVos, new Comparator<UserMockSubscribeVo>() {
+            @Override
+            public int compare(UserMockSubscribeVo o1, UserMockSubscribeVo o2) {
+                //TODO: 升序排列
+                //return o1.getApplySiteExamTime().compareTo(o2.getApplySiteExamTime());
+                //TODO: 降序排列
+                return o2.getApplySiteExamTime().compareTo(o1.getApplySiteExamTime());
+            }
+        });
+
         return userMockSubscribeVos;
     }