Merge branch 'master' into docker_package

renren-admin/src/main/java/io/renren/modules/fuse/controller/FuseController.java

@@ -51,6 +51,9 @@ public class FuseController {
             @ApiImplicitParam(name = "district", value = "赋能场景类型", paramType = "query", dataType = "int")
     })
     public Result<PageData<TbFuseDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params) {
+        if (params.containsKey("orderType")) {
+            params.put("order", params.get("orderType"));
+        }
         PageData<TbFuseDTO> page = tbFuseService.page(params);
         return new Result<PageData<TbFuseDTO>>().ok(page);
     }