From 3b1be358f4d8709d53901d9e16d4d1552b2d0b4f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期六, 17 七月 2021 23:07:46 +0800
Subject: [PATCH] 合并远程分支，并处理冲突
---
java110-bean/src/main/java/com/java110/po/advert/AdvertPo.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/po/advert/AdvertPo.java b/java110-bean/src/main/java/com/java110/po/advert/AdvertPo.java
index e9bfdd9..0a6eafa 100755
--- a/java110-bean/src/main/java/com/java110/po/advert/AdvertPo.java
+++ b/java110-bean/src/main/java/com/java110/po/advert/AdvertPo.java
@@ -25,7 +25,8 @@
private String endTime;
private String createTime;
private String viewType;
-
+ private String advertType ;
+ private String pageUrl ;
public String getAdvertId() {
return advertId;
@@ -130,4 +131,20 @@
public void setViewType(String viewType) {
this.viewType = viewType;
}
+
+ public String getAdvertType() {
+ return advertType;
+ }
+
+ public void setAdvertType(String advertType) {
+ this.advertType = advertType;
+ }
+
+ public String getPageUrl() {
+ return pageUrl;
+ }
+
+ public void setPageUrl(String pageUrl) {
+ this.pageUrl = pageUrl;
+ }
}
--
Gitblit v1.8.0