Merge branch 'lc_upvote_250220' into uat

suishenbang-admin/src/main/resources/templates/system/upvoteLog/upvoteLog.html

@@ -178,7 +178,7 @@
                     title : '销售部'
                 },
                 {
-                    field : 'createTime',
+                    field : 'updateTime',
                     title : '操作时间'
                 },
                 {

suishenbang-system/src/main/resources/mapper/system/AlertUpvoteLogMapper.xml

@@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select alert_upvote_id as alertUpvoteId,
                alert_id as alertId,
                create_time as createTime,
+               update_time as updateTime,
                user_id as userId,
                status as status,
                login_name as loginName,