Commit 38c8820a authored by renjie's avatar renjie

ip状态bug

parent 42f5b21b
......@@ -88,7 +88,7 @@ public class IpControlloer {
ResultDto resultDto = new ResultDto();
try {
IpPageResultDto ipResourceDto = ipResourceService.getIpList(principal.getName(), ipListRequestDto.getGroupType(), ipListRequestDto.getPage(),
ipListRequestDto.getAmount(), ipListRequestDto.getIpFilterDto());
ipListRequestDto.getAmount(), ipListRequestDto.getFilter());
resultDto.setData(ipResourceDto);
resultDto.setStatus(0);
}catch (ClientRequestException e) {
......
......@@ -10,7 +10,7 @@ public class IpListRequestDto {
private int groupType;
private int page;
private int amount;
private IpFilterDto ipFilterDto;
private IpFilterDto filter;
public int getAmount() {
return amount;
......@@ -36,11 +36,11 @@ public class IpListRequestDto {
this.page = page;
}
public IpFilterDto getIpFilterDto() {
return ipFilterDto;
public IpFilterDto getFilter() {
return filter;
}
public void setIpFilterDto(IpFilterDto ipFilterDto) {
this.ipFilterDto = ipFilterDto;
public void setFilter(IpFilterDto filter) {
this.filter = filter;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment