1

src/main/java/com/fdkankan/manage_jp/controller/LaserController.java

@@ -138,7 +138,8 @@ public class LaserController extends BaseController{
         Page<SceneVo> page2 = sceneProMapper.pageList(new Page<>(sceneParam.getPageNum(),sceneParam.getPageSize()),sceneParam);
         List<String> numList2 = page.getRecords().stream().map(SceneVo::getNum).collect(Collectors.toList());
         List<String> numList3 = page2.getRecords().stream().map(SceneVo::getNum).collect(Collectors.toList());
-        jsonObject.put("list",numList2.addAll(numList3));
+        numList2.addAll(numList3);
+        jsonObject.put("list",numList2);
         return Result.success(jsonObject);
     }