Merge branch 'master' into UI-09-03

server/app/common/enum/AdminTerminalEnum.php

@@ -25,4 +25,6 @@ class AdminTerminalEnum
 {
     const PC = 1;
     const MOBILE = 2;
-}
+    // 企业微信客服桌面软件。与网页端分开保存会话，桌面登录不会顶掉浏览器登录。
+    const WECOM_RPA = 7;
+}

server/app/common/enum/user/UserTerminalEnum.php

@@ -28,6 +28,7 @@ class UserTerminalEnum
     const PC         = 4;//电脑PC
     const IOS        = 5;//苹果app
     const ANDROID    = 6;//安卓app
+    const WECOM_RPA  = 7;//企业微信客服桌面端
 
 
     const ALL_TERMINAL = [
@@ -37,6 +38,7 @@ class UserTerminalEnum
         self::PC,
         self::IOS,
         self::ANDROID,
+        self::WECOM_RPA,
     ];
 
     /**
@@ -55,10 +57,11 @@ class UserTerminalEnum
             self::PC            => '电脑PC',
             self::IOS           => '苹果APP',
             self::ANDROID       => '安卓APP',
+            self::WECOM_RPA     => '企业微信客服桌面端',
         ];
         if(true === $from){
             return $desc;
         }
         return $desc[$from] ?? '';
     }
-}
+}