Merge branch 'wjc_new' into lwj_new

mac

2024-05-29 16787451d10076eb72dc87aba0d20dc060be9b67

1
2
3
4
5
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
    <solid android:color="@color/text_FFB300" />
    <corners android:bottomLeftRadius="@dimen/dp_6" />
</shape>