From 09c1e21cad0b474babb1d2f67f481b582adf0b0f Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 29 七月 2025 14:43:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/resources/mapper/lmk/VideoCommentMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/framework/src/main/resources/mapper/lmk/VideoCommentMapper.xml b/framework/src/main/resources/mapper/lmk/VideoCommentMapper.xml
index 59e68f2..672c021 100644
--- a/framework/src/main/resources/mapper/lmk/VideoCommentMapper.xml
+++ b/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" />

--
Gitblit v1.8.0