ShiQi c2e2684f52 Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo into IM-gift ... # Conflicts: # Zhibo/zhibo-h/crmeb-admin/src/main/java/com/zbkj/admin/task/live/LiveStatusSyncTask.java # android-app/app/src/main/java/com/example/livestreaming/RoomDetailActivity.java # android-app/app/src/main/res/layout/dialog_make_wish.xml # android-app/app/src/main/res/layout/dialog_view_wish.xml		2025-12-31 18:07:54 +08:00
..
src/main	Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo into IM-gift	2025-12-31 18:07:54 +08:00
pom.xml	IM需求文档的开发，送礼物的功能的实现	2025-12-25 17:09:41 +08:00