Merge branch 'wjc_new' into develop_new

mac

2024-05-29 6666e651e35ef6ae079247da975c58098111c13c

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