Merge branch 'google' into qiye

baseswago/src/main/java/com/swago/baseswago/activity/WebViewActivity.kt

@@ -54,6 +54,7 @@ class WebViewActivity : BaseXActivity<ActivityWebBinding>() {
                 jsonObject.put("AppVersionParam", SwagoInfo.getVersionCode())
                 jsonObject.put("ClientParam", SwagoInfo.getAppClient())
                 jsonObject.put("ChannelParam", SwagoInfo.getChannel())
+                jsonObject.put("DeviceParam", SwagoInfo.getDeviceInfo())
                 settings.userAgentString = settings.userAgentString + jsonObject.toString()
             } catch (e: Exception) {
                 e.printStackTrace()