FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

标准清单入库 bug修复

Browse Source
This commit is contained in:
yuezhihang
2021-07-21 16:41:37 +08:00
parent 310cdf9473
commit 3595ea2aa3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java
+2 -1
View File
@@ -7,6 +7,7 @@ import com.adc.da.slrs.sarStandProjectLibrary.service.impl.SarStandProjectLibrar
import com.alibaba.excel.EasyExcel; import com.alibaba.excel.EasyExcel;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@@ -87,7 +88,7 @@ public class SarStandProjectLibraryController extends BaseController<SarStandPro
p.setSarStandProjectLibraries(list2); p.setSarStandProjectLibraries(list2);
listTemp.add(p); listTemp.add(p);
} }
IPage<productLineDto> pageres=new Page(); IPage<productLineDto> pageres=new Page<>();
pageres.setRecords(listTemp); pageres.setRecords(listTemp);
pageres.setPages(list1.getPages()); pageres.setPages(list1.getPages());
pageres.setTotal(list1.getTotal()); pageres.setTotal(list1.getTotal());