合并解决冲突或升级jdk17语法
This commit is contained in:
parent
065cd4dc20
commit
45c3b95805
@ -6,7 +6,7 @@ import io.swagger.annotations.ApiImplicitParam;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.annotations.ApiImplicitParams;
|
||||
import java.util.HashMap;
|
||||
import springfox.documentation.annotations.ApiIgnore;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@ -52,7 +52,7 @@ public class UserConfigController {
|
||||
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
|
||||
})
|
||||
@GetMapping(value = "/page")
|
||||
public Result<IPage<UserConfigVo>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
|
||||
public Result<IPage<UserConfigVo>> queryPageList(@Parameter(hidden = true) @RequestParam HashMap<String, Object> param) {
|
||||
return Result.success(userConfigService.queryPageList(param));
|
||||
}
|
||||
|
||||
@ -63,7 +63,7 @@ public class UserConfigController {
|
||||
@OperLog(operModul = "用户配置管理", operType = "列表查询", operDesc = "列表查询用户配置信息")
|
||||
@ApiOperation(value = "列表查询用户配置信息", notes = "列表查询用户配置信息", httpMethod="GET")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<UserConfigVo>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
|
||||
public Result<List<UserConfigVo>> queryList(@Parameter(hidden = true) @RequestParam HashMap<String, Object> param) {
|
||||
return Result.success(userConfigService.queryList(param));
|
||||
}
|
||||
|
||||
@ -83,7 +83,7 @@ public class UserConfigController {
|
||||
@ApiOperation(value = "删除用户配置信息", notes = "删除用户配置信息" , httpMethod="POST")
|
||||
@ApiImplicitParam(name = "id", value = "用户配置ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}")
|
||||
@PostMapping(value = "/delete")
|
||||
public Result<UserConfig> delete(@ApiIgnore @RequestBody HashMap<String ,Object> map) {
|
||||
public Result<UserConfig> delete(@Parameter(hidden = true) @RequestBody HashMap<String ,Object> map) {
|
||||
userConfigService.delete(MapUtils.getString(map, "id"));
|
||||
return Result.ok();
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user