Merge branch 'wjc_new' into develop_new

mac

2024-05-30 1ef9c12f9e1edd46fd3edac5363d3519a5e0c05f

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>