Merge remote-tracking branch 'origin/release' into feat/diamond_category_zl

# Conflicts:
#	build.gradle

m-im/src/main/res/layout/im_activity_other_msg_detail.xml

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
@@ -28,6 +27,7 @@
                 android:id="@+id/lv_content"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:paddingBottom="30dp"
                 android:background="#f3f3f3"
                 android:divider="@null" />
 

m-user/src/main/java/com/yidianling/user/mine/MineFragment.kt

@@ -214,12 +214,7 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
                         val orderNum = response.data?.consultOrderNum ?: 0
                         if (orderNum > 0) {
                             iv_order_tip.visibility = View.VISIBLE
-                            val numberStr = if (orderNum > 99) {
-                                "99+"
-                            } else {
-                                "$orderNum"
-                            }
-                            iv_order_tip.text = numberStr
+                            iv_order_tip.text = orderNum.toString()
                             getLocal().setConsult(true)
                             getLocal().setConsultNum(orderNum)
                         } else {

m-user/src/main/res/layout/user_mine_fragment_mine.xml

@@ -428,7 +428,7 @@
                                     app:layout_constraintCircle="@id/iv_trade_order"
                                     app:layout_constraintCircleAngle="45"
                                     app:layout_constraintCircleRadius="10dp"
-                                    tools:text="9"
+                                    tools:text="911"
                                     tools:visibility="visible" />
 
                                 <TextView