From 799cdcaa6167b848fda70914a1afe97a05ac1b06 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 30 Oct 2019 21:20:06 +0800 Subject: [PATCH] =?UTF-8?q?[PO][=E4=BF=AE=E6=94=B9]:=E9=9B=86=E5=9B=A2?= =?UTF-8?q?=E7=89=88=E9=A2=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java | 1 - .../src/main/java/com/iformall/domain/po/WxCoupon.java | 1 - .../src/main/java/com/iformall/domain/po/WxTopic.java | 2 +- .../src/main/java/com/iformall/domain/po/WxUserVisit.java | 2 -- .../main/java/com/iformall/domain/po/WxWeappReleaseStatus.java | 2 -- .../src/main/java/com/iformall/utils/QRCodeUtils.java | 2 +- 6 files changed, 2 insertions(+), 8 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java index d6be8e8ea..40827c8e6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java @@ -26,7 +26,6 @@ public class WxCUserBasicInfo extends BaseTenantEntity { @JsonIgnore protected Date scoreDate; - @Excel(name="姓名",width = 20,orderNum = "1") @NotNull @io.swagger.annotations.ApiModelProperty(value="用户姓名",name="name") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index af0cede67..d9cf2aa75 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -24,7 +24,6 @@ public class WxCoupon extends TenantEntity { protected Long id; - @TableField(exist = false) protected List types; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java index 8693ccc85..7fb391899 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java @@ -17,8 +17,8 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class WxTopic extends TenantEntity { - protected Long id; + @io.swagger.annotations.ApiModelProperty(value="名称",name="name") private String name; @io.swagger.annotations.ApiModelProperty(value="标题",name="title") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java index a9a0261e9..369bd83ee 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java @@ -14,8 +14,6 @@ public class WxUserVisit extends BaseTenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="日期字符串",name="refDate") private String refDate; @io.swagger.annotations.ApiModelProperty(value="日期",name="dayDate") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java index 0a77d91b2..b4d7d2729 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java @@ -15,8 +15,6 @@ public class WxWeappReleaseStatus extends BaseTenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") private String appId; @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type") diff --git a/mallinkService/src/main/java/com/iformall/utils/QRCodeUtils.java b/mallinkService/src/main/java/com/iformall/utils/QRCodeUtils.java index f9ec744e4..2acabd605 100644 --- a/mallinkService/src/main/java/com/iformall/utils/QRCodeUtils.java +++ b/mallinkService/src/main/java/com/iformall/utils/QRCodeUtils.java @@ -12,7 +12,7 @@ import java.io.File; */ public class QRCodeUtils { - public static String PAGE_URL = "pages/index/index"; + public static String PAGE_URL = Constant.mainPageUrl; public static final int QR_WIDTH = 430; public static final int QR_HIGHT = 430;