Merge branch 'develop6.0-tmd' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop6.0-tmd

TEAMModelOS/ClientApp/src/locale/lang/en-US/teachermgmt.js

@@ -248,7 +248,7 @@ export default {
     qrcodeJoin:'Join with QR Code',
     tipsTitle:'Notice：',
     tipsContent1:"1. Teachers who scan the code to join do not need the administrator's permission and will join the school directly；",
-    tipsContent2:'2. The QR code is valid for 1 day and expires automatically after that；',
+    tipsContent2:'2. The QR code is valid for 1 hour and expires automatically after that；',
     tipsContent3:'3. Only support HiTA to scan code to join.',
     qrcodeErr:'Failed to generate QR code'
 }

TEAMModelOS/ClientApp/src/locale/lang/zh-CN/teachermgmt.js

@@ -248,7 +248,7 @@ export default {
     qrcodeJoin:'二维码加入',
     tipsTitle:'温馨提示：',
     tipsContent1:'1、扫码加入的老师无需管理员同意直接加入学校；',
-    tipsContent2:'2、二维码有效期为1天，超时自动过期；',
+    tipsContent2:'2、二维码有效期为1小时，超时自动过期；',
     tipsContent3:'3、仅支持HiTA扫码加入。 ',
     qrcodeErr:'二维码生成失败'
 }

TEAMModelOS/ClientApp/src/locale/lang/zh-TW/teachermgmt.js

@@ -248,7 +248,7 @@ export default {
     qrcodeJoin:'二維碼加入',
     tipsTitle:'溫馨提示：',
     tipsContent1:'1、掃碼加入的老師無需管理員同意直接加入學校；',
-    tipsContent2:'2、二維碼有效期為1天，超時自動過期；',
+    tipsContent2:'2、二維碼有效期為1小時，超時自動過期；',
     tipsContent3:'3、僅支持HiTA掃碼加入。',
     qrcodeErr:'二維碼生成失敗'
 }