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

peng

3 天以前 904812187f2fb4eafc9071458f3a91d3f7b7748a

 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