Merge branch 'send_coupon' into user_action

peng

2 天以前 e46e620ea7afd8b18aa24dde8e3c9564355fa14f

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

@@ -63,7 +63,6 @@
            LCV.update_by,
            LCV.delete_flag,
            LCV.user_nickname,
            LCV.id
            LCV.id,
            LGS.original
        FROM