From a381a654833decf21cad316ffbda8b3e9c834118 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 26 二月 2019 19:01:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponMapper.xml
index 059f4c1..2c37f53 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponMapper.xml
@@ -121,7 +121,7 @@
AND uc.usc_coupon_id in
<foreach collection="list" item="item" open="(" close=")"
separator=",">#{item}</foreach>
- ORDER BY uc.`usc_create_time`
+ ORDER BY uc.usc_state_activate, uc.`usc_create_time`
</select>
</mapper>
--
Gitblit v1.8.0