Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2023-01-09 09:34:33 +08:00
commit 2a315cbbe6
1 changed files with 3 additions and 0 deletions

View File

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