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

zxl

2 天以前 f3ccf81a4f203dd0d8957bab15c491cb2181e071

 framework/src/main/java/cn/lili/modules/lmk/domain/vo/CouponVirtualVO.java

@@ -64,6 +64,8 @@

    private String original;

    private String userNickName;

    public static CouponVirtualVO getVoByEntity(@NonNull CouponVirtual entity, CouponVirtualVO vo) {
        if(vo == null) {
            vo = new CouponVirtualVO();