ShiQi 909d1994a1 Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo into IM-gift ... # Conflicts: # Zhibo/zhibo-h/crmeb-common/src/main/java/com/zbkj/common/request/UserEditRequest.java # Zhibo/zhibo-h/crmeb-front/src/main/java/com/zbkj/front/controller/LiveRoomController.java # Zhibo/zhibo-h/crmeb-service/src/main/java/com/zbkj/service/service/impl/FriendServiceImpl.java # Zhibo/zhibo-h/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserServiceImpl.java # Zhibo/zhibo-h/crmeb-service/src/main/resources/mapper/FollowRecordDao.xml # android-app/app/src/main/java/com/example/livestreaming/EditProfileActivity.java # android-app/app/src/main/java/com/example/livestreaming/ProfileActivity.java # android-app/app/src/main/java/com/example/livestreaming/net/UserEditRequest.java # android-app/app/src/main/java/com/example/livestreaming/net/UserInfoResponse.java		2026-01-04 08:59:19 +08:00
..
src/main	Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo into IM-gift	2026-01-04 08:59:19 +08:00
pom.xml	Merge branch 'merge/unify-all' of http://115.190.64.57:8000/xiaozhang/zhibo into IM-gift	2025-12-26 08:48:16 +08:00