Merge remote-tracking branch 'upstream/main'

web/src/components/UsersTable.js

@@ -226,6 +226,7 @@ const UsersTable = () => {
                     <Popup
                       content={user.email ? user.email : '未绑定邮箱地址'}
                       key={user.username}
+                      header={user.display_name ? user.display_name : user.username}
                       trigger={<span>{renderText(user.username, 10)}</span>}
                       hoverable
                     />

web/src/pages/Channel/EditChannel.js

@@ -280,7 +280,6 @@ const EditChannel = () => {
               <Form.TextArea
                 label='密钥'
                 name='key'
-                required
                 placeholder={'请输入密钥，一行一个'}
                 onChange={handleInputChange}
                 value={inputs.key}