Parcourir la source

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real

release_toaliyun_real
winter il y a 4 ans
Parent
révision
4fafada151
2 fichiers modifiés avec 2 ajouts et 3 suppressions
  1. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java
  2. +0
    -3
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java Voir le fichier

@@ -35,6 +35,8 @@ public class WxCouponCVo extends WxCoupon implements Serializable {


@TableField(exist = false) @TableField(exist = false)
private String qrCode; private String qrCode;
@TableField(exist = false)
private String ttQrCode;




@io.swagger.annotations.ApiModelProperty(value="券ID",name="couponId") @io.swagger.annotations.ApiModelProperty(value="券ID",name="couponId")


+ 0
- 3
mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml Voir le fichier

@@ -773,9 +773,6 @@
co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info`,co.subsidy co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info`,co.subsidy
FROM wx_coupon_order co FROM wx_coupon_order co
where co.id = #{id} and co.tenant_id = #{tenantId} where co.id = #{id} and co.tenant_id = #{tenantId}
<if test=" null != parentTenantId and '' != parentTenantId">
and co.`parent_tenant_id` = #{parentTenantId}
</if>
</select> </select>




Chargement…
Annuler
Enregistrer