解决冲突

app/build.gradle

@@ -13,7 +13,7 @@ android {
         applicationId rootProject.APPLICATION_ID
         minSdkVersion rootProject.ext.androidMinSdkVersion
         targetSdkVersion rootProject.ext.androidTargetSdkVersion
-        versionCode 20211015
+        versionCode 20211018
         versionName "1.1.3"
         flavorDimensions "default"
 

app/src/main/java/com/mints/fiveworld/ui/activitys/SettingsActivity.kt

@@ -107,7 +107,6 @@ class SettingsActivity : BaseActivity(), View.OnClickListener {
         item_cancel.findViewById<ImageView>(R.id.iv_right).visibility = View.VISIBLE
 
         if (!userManager.userIsLogin()) {
-            item_cancel.visibility = View.GONE
             btn_switch.visibility = View.GONE
         }
     }