hch ba7e59a946 Merge branch 'pandorapan_社区相关' into dev_改版主分支 ... # Conflicts: # common/build.gradle # common/src/main/java/com/yunbao/common/bean/MessageUserInfoBean.java # common/src/main/java/com/yunbao/common/http/PDLiveApi.java # common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java # common/src/main/java/com/yunbao/common/utils/RouteUtil.java # common/src/main/res/values/strings.xml # main/src/main/java/com/yunbao/main/activity/MainActivity.java		2024-03-15 17:27:31 +08:00
..
assets	1	2024-02-23 16:07:50 +08:00
java/com/yunbao/live	UPDATE聊天页面改版UI	2024-03-08 16:25:49 +08:00
res	Merge branch 'pandorapan_社区相关' into dev_改版主分支	2024-03-15 17:27:31 +08:00
AndroidManifest.xml	UPDATE聊天页面改版UI	2024-03-08 16:25:49 +08:00