Merge branch 'master' into docker_package

renren-admin/src/main/java/io/renren/modules/sys/controller/SysUserController.java

@@ -34,10 +34,7 @@ import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -193,6 +190,8 @@ public class SysUserController {
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         params.put("export", true);
         List<SysUserDTO> list = sysUserService.list(params);
+        // HIQDUCS-695 默认导出创建时间逆序
+        list = list.stream().sorted(Comparator.comparing(SysUserDTO::getCreateDate).reversed()).collect(Collectors.toList());
         ExcelUtils.exportExcelToTarget(response, null, "用户管理", list, SysUserExcel.class);
     }