Merge remote-tracking branch 'origin/send_coupon' into send_coupon

peng

6 天以前 fa6528a77821c3fb7a46c2a8b63a2adb6da4fc10

 framework/src/main/resources/mapper/lmk/CouponVirtualMapper.xml

@@ -64,7 +64,11 @@
        FROM
            lmk_coupon_virtual LCV
        WHERE
            LCV.deleted = 0
            LCV.delete_flag = 0
        <if test="query.orderId != null and query.orderId !=''">
           AND LCV.order_id = #{query.orderId}
        </if>
    </select>


</mapper>