From e24ccd071ee4ea5200d0d1cd74fd5a685d3d57c2 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 9 Oct 2020 15:00:38 +0800 Subject: [PATCH] fix bug --- .../src/main/java/com/iformall/domain/vo/WxMerchantVo.java | 4 ++++ mallinkService/src/main/resources/mapper/WxMerchantMapper.xml | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java index 704bfa2fd..fc96c819b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java @@ -5,6 +5,7 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Date; import java.util.List; @JsonIgnoreProperties(value = {"handler"}) @@ -91,4 +92,7 @@ public class WxMerchantVo extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "客服电话", name = "linkLinePhone") private String linkLinePhone; + + @io.swagger.annotations.ApiModelProperty(value = "置顶时间", name = "topTime") + private Date topTime; } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 5c94e287f..faebd418d 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -349,7 +349,7 @@ distinct m.id,m.img_url,m.name,m.link_phone,m.status,m.business_id, m.is_public,m.email,m.title,m.cover_picture,m.sub_business_id, - m.shop_type,m.introduction,m.action_desc,bu.title as business_name,m.link_line_phone + m.shop_type,m.introduction,m.action_desc,bu.title as business_name,m.link_line_phone,m.top_time