Commit Graph

17 Commits

Author SHA1 Message Date
xiao12feng8
37ee807c8a Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo 2025-12-30 19:00:25 +08:00
3e9a65af3f 管理端缘池,许愿树。 2025-12-30 18:53:46 +08:00
xiao12feng8
91a58d090b Merge conflict resolved 2025-12-30 18:26:21 +08:00
cxytw
2c73d0c552 12月30号管理端界面优化,前后端配置 2025-12-30 17:27:55 +08:00
cxytw
ce0e27f9e7 管理端前端页面修复完善 2025-12-30 16:22:27 +08:00
xiao12feng8
e83568f5fb bug:修复消息不能撤回 2025-12-30 11:11:07 +08:00
cxytw
892b84e070 管理端界面优化 2025-12-29 14:56:26 +08:00
cxytw
7d151996c0 Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo
# Conflicts:
#	Zhibo/admin/src/theme/app.scss
#	Zhibo/zhibo-h/crmeb-front/src/main/java/com/zbkj/front/config/WebSocketConfig.java
#	Zhibo/zhibo-h/crmeb-front/src/main/java/com/zbkj/front/controller/CallController.java
#	Zhibo/zhibo-h/crmeb-front/src/main/java/com/zbkj/front/websocket/CallSignalingHandler.java
#	Zhibo/zhibo-h/crmeb-service/src/main/java/com/zbkj/service/service/impl/CallServiceImpl.java
#	Zhibo/zhibo-h/crmeb-service/src/main/java/com/zbkj/service/service/impl/ConversationServiceImpl.java
2025-12-29 10:43:09 +08:00
userName
ca9789ba72 修改后台管理界面 2025-12-27 18:32:29 +08:00
cxytw
bb4bf666f4 管理端界面优化 2025-12-26 18:06:34 +08:00
cxytw
40a95ee5da 管理端界面优化 2025-12-26 17:58:59 +08:00
cxytw
148297e8d2 管理端界面优化 2025-12-26 17:55:01 +08:00
xiao12feng8
e85f9c42ad 消息引用+撤回+敏感词接口 2025-12-26 15:16:40 +08:00
xiao12feng8
673ab55599 feat: 修复搜索用户功能和会话列表功能 - 添加 CircleImageView 依赖 - 修复 AuthHelper.getToken 改为 AuthStore.getToken - 添加 AddFriendActivity 调试日志 - 修改 MessagesActivity 从后端 API 获取会话列表 - 添加好友管理相关的 Controller 和 Service 2025-12-24 18:11:39 +08:00
xiao12feng8
9160e6e1a9 连接直播 2025-12-23 15:38:35 +08:00
xiao12feng8
7094cbccbc live: admin live room list + url host fix + app use backend urls 2025-12-23 11:39:57 +08:00
xiao12feng@outlook.com
087e1feae6 chore: avoid committing per-developer live config 2025-12-21 17:32:12 +08:00