소스 검색

佰穗莱分页代码优化

ChenYang 1 년 전
부모
커밋
ac59c615a7

+ 1 - 1
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java

@@ -84,7 +84,7 @@ public class BaseController
     }
 
 
-    protected TableDataInfo getDataTable(PageInfo pageInfo)
+    protected <T> TableDataInfo getDataTable(PageInfo<T> pageInfo)
     {
         TableDataInfo rspData = new TableDataInfo();
         rspData.setCode(HttpStatus.SUCCESS);

+ 2 - 0
warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/org/bean/dto/OrgDTO.java

@@ -3,7 +3,9 @@ package com.ruoyi.ams.bionutrition.org.bean.dto;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.bean.dto.WarewmsExtDTO;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class OrgDTO extends WarewmsExtDTO {
     private static final long serialVersionUID = -5857432637699543656L;