Merge branch 'send_coupon' into user_action

peng

3 天以前 e4dd7447aaa4563b9e64a7556710677a140776eb

 framework/src/main/java/cn/lili/modules/lmk/domain/entity/ActionRecord.java

@@ -21,7 +21,7 @@

    @TableField("user_id")
    /** 用户id */
    private Long userId;
    private String userId;

    @TableField("session_id")
    /** 页面会话id */