Просмотр исходного кода

Merge tag 'refs/tags/jenkins-back-end-2395' into release

develop
release_toaliyun_real
gongbiao 6 лет назад
Родитель
Сommit
81d0df96b8
1 измененных файлов: 2 добавлений и 2 удалений
  1. +2
    -2
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

+ 2
- 2
mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml Просмотреть файл

@@ -950,13 +950,13 @@
<sql id="allCUserCardListColumns"> <sql id="allCUserCardListColumns">
co.id,co.tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.create_date,co.update_date, co.id,co.tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,
c.cover_img,c.title,c.sub_title,c.detail,c.unit,c.remark, c.cover_img,c.title,c.sub_title,c.detail,c.unit,c.remark,
a.amount,a.remaining_amount,case when c.status=1 then 0 else c.support_transfer end support_transfer
a.amount,a.remaining_amount,a.support_transfer
</sql> </sql>


<sql id="allCUserCardDetailColumns"> <sql id="allCUserCardDetailColumns">
co.id,co.tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, co.id,co.tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,
c.cover_img,c.title,c.sub_title,c.sale_price,c.price,c.unit,c.detail,c.remark, c.cover_img,c.title,c.sub_title,c.sale_price,c.price,c.unit,c.detail,c.remark,
a.amount,a.remaining_amount,case when c.status=1 then 0 else c.support_transfer end support_transfer
a.amount,a.remaining_amount,a.support_transfer
</sql> </sql>






Загрузка…
Отмена
Сохранить