Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令

2023-12-20 16:27:44 +08:00
parent dea3264577 7b103aaf7c
commit 61ee585ae9
3 changed files with 18 additions and 6 deletions
--- a/common/src/main/res/layout/order_level_popup.xml
+++ b/common/src/main/res/layout/order_level_popup.xml
@@ -32,6 +32,7 @@
        android:gravity="center_vertical">

        <TextView
+            android:id="@+id/current"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginStart="46dp"