Merge branch 'branch_new_dev' into branch_new

2025-11-20 09:42:20 +08:00
parent 57b8ded0eb e9e50c1b65
commit acec782e3a
18 changed files with 40 additions and 1769 deletions
--- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java
@@ -12,7 +12,6 @@ import com.xscm.moduleutil.R;
 import com.xscm.moduleutil.bean.UserInfo;
 import com.xscm.moduleutil.bean.room.RoomPitBean;
 import com.xscm.moduleutil.utils.ImageUtils;
-import com.xscm.moduleutil.utils.SpUtil;

 /**
 * @Author lxj$