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

peng

7 天以前 f931144c06ce670ee0eb7384ea05cde4c4497dd3

 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