Merge branch 'send_coupon' into user_action

peng

9 小时以前 e46e620ea7afd8b18aa24dde8e3c9564355fa14f

 framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java

@@ -63,7 +63,8 @@
            "o.logistics_time AS logistics_time," +
            "o.complete_time AS complete_time," +
            "o.store_name AS store_name, " +
            "m.nick_name AS nickName" +
            "m.nick_name AS nickName," +
            "o.member_id AS memberId" +
            " FROM li_order o LEFT JOIN li_order_item oi ON oi.order_sn = o.sn " +
            "LEFT JOIN li_member m on m.id = o.member_id " +
            "${ew.customSqlSegment}")