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

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")

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}
-		<if test=" null != parentTenantId and '' != parentTenantId">
-			and co.`parent_tenant_id` = #{parentTenantId}
-		</if>
 	</select>