Merge branch 'wjc_new' into develop_new

mac

2024-04-19 788c70114287306db20e9a4539018d6e32fb5cb7

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_38C494"/>
    <corners android:radius="@dimen/dp_4"/>
</shape>