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

zxl

3 天以前 f3ccf81a4f203dd0d8957bab15c491cb2181e071

 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