Merge branch 'master' into dev_proguard

2023-06-12 10:50:27 +08:00
parent c8c4352284 ae9c050ae6
commit 29ddc54303
10 changed files with 67 additions and 18 deletions
--- a/config.gradle
+++ b/config.gradle
@@ -4,7 +4,7 @@ ext {
            buildToolsVersion: "29.0.2",
            minSdkVersion    : 21,
            targetSdkVersion : 31,
-            versionCode      : 423,
+            versionCode      : 428,
            versionName      : "6.5.2"
    ]
    manifestPlaceholders = [
@@ -26,7 +26,7 @@ ext {
 //            true表示谷歌支付 false
            isGooglePlay     :  false,
            //是否上报异常日志
-            isUploadLog      :  false
+            isUploadLog      :  true
    ]
 }
 //7664 1