From 714145fa4035f08d719c27be73b1dbb32c97e030 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 7 May 2019 16:02:06 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=8E=92=E5=BA=8F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/domain/po/WxMerchant.java | 6 ++++++ .../com/iformall/service/impl/WxMerchantServiceImpl.java | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 56897deb5..98591c6bf 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -489,6 +489,12 @@ public class WxMerchant extends BaseEntity { this.rentShopType = rentShopType; } + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index daa2f4c37..4b5d25b67 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -360,7 +360,6 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); wxMerchant.setUpdateDate(date); wxMerchant.setCreateDate(date); - wxMerchant.setTopTime(date); List coverPicture = JSONArray.parseArray(wxMerchant.getCoverPicture(), String.class); if (!coverPicture.isEmpty()) { wxMerchant.setImgUrl(coverPicture.get(0));