Merge remote-tracking branch 'origin/master'

Lius

6 天以前 7d2ae4c2fd8d45f0896b9accf84ff4177638fbcd

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusChangeController.java

@@ -19,8 +19,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;

 /**
 * @Description: 技术状态变更申请
 * @Author: jeecg-boot
@@ -41,15 +39,13 @@
    * @param query
    * @param pageNo
    * @param pageSize
    * @param req
    * @return
    */
   @ApiOperation(value="技术状态变更申请-分页列表查询", notes="技术状态变更申请-分页列表查询")
   @GetMapping(value = "/list")
   public Result<?> queryPageList(EamTechnicalStatusChangeQuery query,
                           @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                           @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                           HttpServletRequest req) {
                           @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
      Page<EamTechnicalStatusChange> page = new Page<EamTechnicalStatusChange>(pageNo, pageSize);
      IPage<EamTechnicalStatusChange> pageList = eamTechnicalStatusChangeService.queryPageList(page, query);
      return Result.OK(pageList);