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

zxl

4 天以前 09c1e21cad0b474babb1d2f67f481b582adf0b0f

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

 framework/src/main/resources/mapper/lmk/VideoCommentMapper.xml

@@ -14,7 +14,7 @@
        <result column="master_comment_id" property="masterCommentId" />
        <result column="status" property="status" />
        <result column="thumbs_up_num" property="thumbsUpNum" />
        <result column="userId" property="userId" />
        <result column="user_id" property="userId" />
        <result column="user_nickname" property="userNickname" />
        <result column="user_avatar" property="userAvatar" />
        <result column="create_time" property="createTime" />