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

# Conflicts:
#	ruoyi-admin/src/main/resources/templates/customer/service/index.html

ruoyi-admin/src/main/resources/templates/customer/service/index.html

@@ -1059,7 +1059,7 @@
         $.get('/customer/service/sessions/' + sessionId, function(data) {
             if (data.code === 0 && data.data) {
                 var session = data.data;
-                var html = '<strong>' + (session.customerName || '访客' + session.sessionId) + '</strong>';
+                var html = '<strong>' + (session.customerName || '访客' + session.userId) + '</strong>';
                 html += ' <span class="text-muted">(' + getStatusText(session.status) + ')</span>';
                 $('#currentSessionInfo').html(html);
             }