From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
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