From 2d7e99e8507ec550c362be7bdf596c26f8531556 Mon Sep 17 00:00:00 2001
From: zhangcx <zhangchuanxi@cdzhnf.com>
Date: Mon, 28 Sep 2020 15:45:42 +0800
Subject: [PATCH] fix #修改公共返回对象实现 Serializable 接口

---
 pom.xml                                                 | 2 +-
 src/main/java/com/irrigation/icl/entity/PageList.java   | 3 ++-
 src/main/java/com/irrigation/icl/entity/PageParam.java  | 4 +++-
 src/main/java/com/irrigation/icl/entity/RestResult.java | 4 +++-
 src/main/java/com/irrigation/icl/utils/ObjectUtils.java | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index b9d54c3..73aa59f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.irrigation</groupId>
     <artifactId>common-lib</artifactId>
-    <version>2.0.6</version>
+    <version>2.0.7</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/java/com/irrigation/icl/entity/PageList.java b/src/main/java/com/irrigation/icl/entity/PageList.java
index 31dc3ed..a2e86b5 100644
--- a/src/main/java/com/irrigation/icl/entity/PageList.java
+++ b/src/main/java/com/irrigation/icl/entity/PageList.java
@@ -7,6 +7,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -19,7 +20,7 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @ApiModel(value = "PageList")
-public class PageList<E> {
+public class PageList<E> implements Serializable {
 
     @ApiModelProperty(value = "总页数")
     private int pages;
diff --git a/src/main/java/com/irrigation/icl/entity/PageParam.java b/src/main/java/com/irrigation/icl/entity/PageParam.java
index ba2b376..0864295 100644
--- a/src/main/java/com/irrigation/icl/entity/PageParam.java
+++ b/src/main/java/com/irrigation/icl/entity/PageParam.java
@@ -6,6 +6,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+
 /**
  * @author zhangchuanxi
  * @version 1.0.0
@@ -15,7 +17,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 @ApiModel(value = "PageParam")
-public class PageParam {
+public class PageParam implements Serializable {
 
     @ApiModelProperty(value = "当前页")
     private Integer page = 1;
diff --git a/src/main/java/com/irrigation/icl/entity/RestResult.java b/src/main/java/com/irrigation/icl/entity/RestResult.java
index dafcb87..d752ed5 100644
--- a/src/main/java/com/irrigation/icl/entity/RestResult.java
+++ b/src/main/java/com/irrigation/icl/entity/RestResult.java
@@ -10,6 +10,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+
 /**
  * @param <T>
  * @author zhangchuanxi
@@ -20,7 +22,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 @ApiModel(value = "RestResult")
-public class RestResult<T> {
+public class RestResult<T> implements Serializable {
     @ApiModelProperty(value = "返回编码类型", example = "200", allowableValues = "200,400")
     private int code;
     @ApiModelProperty(value = "返回提示消息", example = "成功")
diff --git a/src/main/java/com/irrigation/icl/utils/ObjectUtils.java b/src/main/java/com/irrigation/icl/utils/ObjectUtils.java
index 88c9bd2..f32b3d4 100644
--- a/src/main/java/com/irrigation/icl/utils/ObjectUtils.java
+++ b/src/main/java/com/irrigation/icl/utils/ObjectUtils.java
@@ -152,7 +152,7 @@ public class ObjectUtils {
      * @param cs
      * @return
      */
-    public static boolean stringNonBlankB(CharSequence cs) {
+    public static boolean stringNonBlank(CharSequence cs) {
         return !stringIsBlank(cs);
     }
 
--
libgit2 0.21.4