Merge remote-tracking branch 'remotes/origin/dev' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java

@@ -3,8 +3,6 @@ package cn.estsh.i3plus.pojo.base.bean;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import io.swagger.annotations.ApiParam;
-import lombok.Getter;
-import lombok.Setter;
 
 import java.util.List;
 import java.util.Map;
@@ -108,31 +106,4 @@ public class BaseResultBean<Obj> {
 
         return rs;
     }
-
-    public BaseResultBean setResultList(List<Obj> resultList) {
-        this.resultList = resultList;
-        return this;
-    }
-
-    public BaseResultBean setResultObject(Obj resultObject) {
-        this.resultObject = resultObject;
-        return this;
-    }
-
-    public BaseResultBean setResultMap(Map<String, Object> resultMap) {
-        this.resultMap = resultMap;
-        return this;
-    }
-
-    public BaseResultBean setPager(Pager pager) {
-        this.pager = pager;
-        return this;
-    }
-
-    public BaseResultBean setListPager(ListPager<Obj> listPager) {
-        this.listPager = listPager;
-        this.setPager(listPager.getObjectPager());
-        this.setResultList(listPager.getObjectList());
-        return this;
-    }
 }