Merge branch 'wjc_new' into develop_new

mac

2024-05-21 d24c8a8d62caf0c0902246972a80f34edd098ba0

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