Merge remote-tracking branch 'origin/dev_改版主分支' into dev_改版主分支

2024-03-22 09:47:07 +08:00
parent 04980cbb2f f2b2c39168
commit 9992dec28e
7 changed files with 22 additions and 7 deletions
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -1486,6 +1486,8 @@ Limited ride And limited avatar frame</string>
    <string name="real_person">真人认证</string>
    <string name="trade_union">工会</string>
    <string name="praise">Like</string>
+    <string name="set_back">已拉黑，无法查看</string>
+    <string name="cancel_back">取消黑名单</string>


 </resources>