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

zxl

昨天 d33b041f4b2a63a22682c9b3f344ef35f84b4542

 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 */