版本合并

zengh

2021-06-01 cd2cfd37366002f790a2ed1435962d4eff7d5cec

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/security/controller/SecurityController.java

@@ -37,6 +37,7 @@
import javax.validation.Valid;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;

/**
 *  控制器
@@ -81,7 +82,7 @@
   @GetMapping("/page")
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "分页", notes = "传入security")
   public R<IPage<SecurityVO>> page(SecurityVO security, Query query) {
   public R<IPage<SecurityVO>> page(Security security, Query query) {
      IPage<SecurityVO> pages = securityService.selectSecurityPage(Condition.getPage(query), security);
      return R.data(pages);
   }