From 1cb5c2b448f1d0818e5425ec21cdcd2152593463 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 17 Jan 2022 16:05:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?/=E3=80=81.coupon=20order?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxCouponOrderMapper.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 01a66d7c1..5e8774166 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -773,9 +773,6 @@ co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info`,co.subsidy FROM wx_coupon_order co where co.id = #{id} and co.tenant_id = #{tenantId} - - and co.`parent_tenant_id` = #{parentTenantId} - From 35e88552112d31422f4942b9af9ababdef8693a9 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 17 Jan 2022 17:05:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?/=E3=80=81.WxCouponCVo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/domain/vo/WxCouponCVo.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java index d98ff13a1..a30b78ce9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java @@ -35,6 +35,8 @@ public class WxCouponCVo extends WxCoupon implements Serializable { @TableField(exist = false) private String qrCode; + @TableField(exist = false) + private String ttQrCode; @io.swagger.annotations.ApiModelProperty(value="券ID",name="couponId")