Ver a proveniência

fix bug

release_toaliyun_real
xiaohanzi há 5 anos
ascendente
cometimento
e24ccd071e
2 ficheiros alterados com 6 adições e 1 eliminações
  1. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java
  2. +2
    -1
      mallinkService/src/main/resources/mapper/WxMerchantMapper.xml

+ 4
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java Ver ficheiro

@@ -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;
}

+ 2
- 1
mallinkService/src/main/resources/mapper/WxMerchantMapper.xml Ver ficheiro

@@ -349,7 +349,7 @@
<sql id="allMerchantVoColumns">
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
</sql>
<select id="getMerchantByCode" parameterType="java.util.Map" resultMap="MerchantVoResultMap">
@@ -396,6 +396,7 @@
<result column="introduction" jdbcType="VARCHAR" property="introduction"/>
<result column="action_desc" jdbcType="VARCHAR" property="actionDesc"/>
<result column="link_line_phone" property="linkLinePhone"/>
<result column="top_time" property="linkLinePhone"/>

<collection column="{merchantId=id}" property="shopVoList"
ofType="com.iformall.domain.vo.WxShopVo"


Carregando…
Cancelar
Guardar