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

# Conflicts:
#	ruoyi-admin/src/main/resources/templates/customer/service/index.html
This commit is contained in:
clunt 2025-11-14 16:25:06 +08:00
commit a02a50cc3c
1 changed files with 2 additions and 2 deletions

View File

@ -957,8 +957,8 @@
console.log('处理转人工请求 ' + (index + 1) + ':', request); console.log('处理转人工请求 ' + (index + 1) + ':', request);
html += '<div class="manual-request-item" data-id="' + request.manualSessionId + '">'; html += '<div class="manual-request-item" data-id="' + request.manualSessionId + '">';
html += ' <div class="request-info">'; html += ' <div class="request-info">';
html += ' <div class="session-id">会话ID: ' + request.userId + '</div>'; html += ' <div class="session-id">访客: ' + request.userId + '</div>';
html += ' <div class="reason">原因: ' + (request.reason || '无') + '</div>'; // html += ' <div class="reason">原因: ' + (request.reason || '无') + '</div>';
html += ' <div class="time">' + formatTime(request.createTime) + '</div>'; html += ' <div class="time">' + formatTime(request.createTime) + '</div>';
html += ' </div>'; html += ' </div>';
html += ' <div class="request-actions">'; html += ' <div class="request-actions">';