Browse Source

Merge remote-tracking branch 'origin/master'

xiexiang 1 year ago
parent
commit
20d6cd34cd

+ 1 - 1
src/main/java/com/example/xiaoshiweixinback/entity/dto/patent/PatentDTO.java

@@ -13,5 +13,5 @@ public class PatentDTO {
 
     private Long pageSize;
 
-    private List<PatentColumnDTO> patents;
+//    private List<PatentColumnDTO> patents;
 }

+ 1 - 1
src/main/java/com/example/xiaoshiweixinback/service/PatentService.java

@@ -17,7 +17,7 @@ public class PatentService {
         Records records = new Records();
         records.setCurrent(queryRequest.getCurrent());
         records.setSize(queryRequest.getSize());
-        records.setData(patentDTO.getPatents());
+//        records.setData(patentDTO.getPatents());
         records.setTotal(patentDTO.getTotal());
         return records;
     }