Merge remote-tracking branch 'origin/master'

lc123/cloud/app/plugin/utils/FWRestfulUtils.java

@@ -206,11 +206,10 @@ public class FWRestfulUtils {
                     String currentDate = getCurrentDate();
                     //当前时间
                     String currentTime = getCurrentTime();
-
                     //封装请求头参数
                     RSA rsa = new RSA(null,spk);
                     //对用户信息进行加密传输,暂仅支持传输OA用户ID
-                    String encryptUserid = rsa.encryptBase64("363", CharsetUtil.CHARSET_UTF_8, KeyType.PublicKey);
+                    String encryptUserid = rsa.encryptBase64("304", CharsetUtil.CHARSET_UTF_8, KeyType.PublicKey);
 
                     DynamicObject pushlog = BusinessDataServiceHelper.newDynamicObject("tqq9_fwpushlog");
                     pushlog.set("name", requestName);