From 7d58823f1a379e957016fb7c2c1715b45eaf40fa Mon Sep 17 00:00:00 2001
From: xiangwb <xiangwb@drore.com>
Date: Thu, 28 Dec 2017 16:56:34 +0800
Subject: [PATCH] merge

---
 boot-service/src/main/java/com/xwbing/util/JSONObjResult.java | 1 -
 boot-service/src/main/java/com/xwbing/util/PageUtil.java      | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/boot-service/src/main/java/com/xwbing/util/JSONObjResult.java b/boot-service/src/main/java/com/xwbing/util/JSONObjResult.java
index f99cbe6..d064795 100644
--- a/boot-service/src/main/java/com/xwbing/util/JSONObjResult.java
+++ b/boot-service/src/main/java/com/xwbing/util/JSONObjResult.java
@@ -21,7 +21,6 @@ public class JSONObjResult {
      * 新增、修改主鍵返回id
      */
     private String id;
-
     /**
      * 消息体
      */
diff --git a/boot-service/src/main/java/com/xwbing/util/PageUtil.java b/boot-service/src/main/java/com/xwbing/util/PageUtil.java
index 31cb345..dcedf59 100644
--- a/boot-service/src/main/java/com/xwbing/util/PageUtil.java
+++ b/boot-service/src/main/java/com/xwbing/util/PageUtil.java
@@ -7,10 +7,9 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * 项目名称: cloud-control-demonstration
  * 创建时间: 2017/10/18 8:55
  * 作者: xiangwb
- * 说明:
+ * 说明: 列表分页工具类
  */
 public class PageUtil {
     public static Map<String, Object> page(JSONArray array, int currentPage, int pageSize) {