Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev

2019-10-10 18:05:36 +08:00 · 2019-10-10 18:05:36 +08:00 · 8b05776895
commit 8b05776895
parent f7cf33a5e2 ca2aced01a
2 changed files with 2 additions and 2 deletions
--- a/src/i18n/langs/zh/trainRoom.js
+++ b/src/i18n/langs/zh/trainRoom.js
@ -21,7 +21,7 @@ export default {
 	endSimulation: '结束仿真',
 	distributeTheRoomQRCode: '分发房间二维码',
 	increaseIbp: '增加IBP',
-	kickOutTheRoom: '提出房间',
+	kickOutTheRoom: '踢出房间',
 	sending: '发送中...',
 	holdAndTalk: '按住说话',
 	recording: '录音中...',
--- a/src/ibp/constant/ibpData.js
+++ b/src/ibp/constant/ibpData.js