This website works better with JavaScript.
Home
Explore
Help
Sign In
server
/
formallProject
Watch
1
Star
0
Fork
0
Code
Issues
0
Pull Requests
0
Releases
0
Wiki
Activity
Browse Source
Merge branch 'release_toaliyun_real' of
https://git.malls.iformall.com/server/formallProject
into release_toaliyun_real
release_toaliyun_real
winter
4 years ago
parent
f5d7426daa
35e8855211
commit
4fafada151
2 changed files
with
2 additions
and
3 deletions
Split View
Diff Options
Show Stats
Download Patch File
Download Diff File
+2
-0
mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java
+0
-3
mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml
+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java
View File
@@ -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")
+ 0
- 3
mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml
View File
@@ -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>
Write
Preview
Loading…
Cancel
Save