Commit d8ef5068 authored by 郭凡凡's avatar 郭凡凡

Merge remote-tracking branch 'origin/master'

parents 8d77907e bd4e737e
...@@ -12,7 +12,6 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -12,7 +12,6 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
......
...@@ -32,7 +32,6 @@ public class OcpTenantBaseServiceImpl extends ServiceImpl<OcpTenantBaseMapper, O ...@@ -32,7 +32,6 @@ public class OcpTenantBaseServiceImpl extends ServiceImpl<OcpTenantBaseMapper, O
@Override @Override
public boolean delectApply(String objId) { public boolean delectApply(String objId) {
if (StringUtils.isBlank(objId)) { if (StringUtils.isBlank(objId)) {
return false; return false;
} }
......
...@@ -76,6 +76,7 @@ public class OcpTenantIocnServiceImpl extends ServiceImpl<OcpTenantIocnMapper, O ...@@ -76,6 +76,7 @@ public class OcpTenantIocnServiceImpl extends ServiceImpl<OcpTenantIocnMapper, O
List<OcpTenantGroupIocnDto> groupIocnDtos = ocpTenantBaseMapper.selectAlls(); List<OcpTenantGroupIocnDto> groupIocnDtos = ocpTenantBaseMapper.selectAlls();
return groupIocnDtos; return groupIocnDtos;
} }
} }
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