diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserLabelAdapter.kt b/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserLabelAdapter.kt
index 020816220..8798cb996 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserLabelAdapter.kt
+++ b/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserLabelAdapter.kt
@@ -3,6 +3,7 @@ package com.yizhuan.erban.ui.user.adapter
 import androidx.appcompat.widget.AppCompatTextView
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.BaseViewHolder
+import com.hjq.toast.ToastUtils
 import com.yizhuan.erban.R
 import com.yizhuan.erban.ui.user.event.UserLabelEvent
 import com.yizhuan.xchat_android_core.user.bean.UserLabelItemInfo
@@ -24,7 +25,7 @@ class UserLabelAdapter :
         val tvLabel = helper.getView<AppCompatTextView>(R.id.tv_user_tag)
         if (item.picked) {
             mutilSelectedList.add(helper.layoutPosition)
-        }else{
+        } else {
             mutilSelectedList.remove(helper.layoutPosition)
         }
         tvLabel.isSelected = item.picked
@@ -34,9 +35,13 @@ class UserLabelAdapter :
                 tvLabel.isSelected = false
                 EventBus.getDefault().post(UserLabelEvent(item.label))
             } else {
-                mutilSelectedList.add(helper.layoutPosition)
-                tvLabel.isSelected = true
-                EventBus.getDefault().post(UserLabelEvent(item.label))
+                if (mutilSelectedList.size != 20) {
+                    mutilSelectedList.add(helper.layoutPosition)
+                    tvLabel.isSelected = true
+                    EventBus.getDefault().post(UserLabelEvent(item.label))
+                } else {
+                    ToastUtils.show(mContext.getString(R.string.max_to_add_label))
+                }
             }
         }
     }
diff --git a/app/src/module_bank_card/res/layout/item_association_room.xml b/app/src/module_bank_card/res/layout/item_association_room.xml
index c14a8cfff..f6386e203 100644
--- a/app/src/module_bank_card/res/layout/item_association_room.xml
+++ b/app/src/module_bank_card/res/layout/item_association_room.xml
@@ -59,6 +59,10 @@
             android:textColor="@color/color_1F1A4E"
             android:textSize="@dimen/sp_15"
             android:textStyle="bold"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:maxEms="8"
+            android:maxLines="1"
             tools:text="公會名稱" />
 
         <TextView
diff --git a/gradle.properties b/gradle.properties
index e5e56e882..d07a9303e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,11 +24,11 @@ only_arm64=false
 
 channel_file=channel.txt
 
-CRASHLYTICS_COLLECTION_ENABLED=true
+CRASHLYTICS_COLLECTION_ENABLED=false
 
 COMPILE_SDK_VERSION=32
 MIN_SDK_VERSION=21
 TARGET_SDK_VERSION=32
 
-version_name=1.5.1
-version_code=151
\ No newline at end of file
+version_name=1.6.0
+version_code=160
\ No newline at end of file