From d4f150414533b95324b2a1c8a81c11d92efb71ec Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 13 Mar 2018 16:25:20 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git

---
 src/main/java/com/moral/common/bean/PageResult.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/moral/common/bean/PageResult.java b/src/main/java/com/moral/common/bean/PageResult.java
index be949f3..710a9ba 100644
--- a/src/main/java/com/moral/common/bean/PageResult.java
+++ b/src/main/java/com/moral/common/bean/PageResult.java
@@ -1,12 +1,12 @@
 package com.moral.common.bean;
 
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.util.List;
 
-@Getter
-@Setter
+@Data
 public class PageResult {
 
     private Long total;

--
Gitblit v1.8.0