Commit fd481bdf authored by 文旺-丰林-DEV's avatar 文旺-丰林-DEV

Merge branch 'uploadFile' into 'master'

fix create password and update upload_style

See merge request !5
parents 40c38579 a4cbb71b
...@@ -329,3 +329,4 @@ node_modules ...@@ -329,3 +329,4 @@ node_modules
*.txt *.txt
/aspnet-core/src/BBM.ChatGLM.Application/User/UsersAppService.cs
...@@ -240,7 +240,7 @@ namespace BBM.ChatGLM.User ...@@ -240,7 +240,7 @@ namespace BBM.ChatGLM.User
} }
else else
{ {
var password = "Zs." + phoneNumber.Substring(phoneNumber.Length - 6); var password = "Zs" + phoneNumber.Substring(phoneNumber.Length - 6);
if (userRole == "管理员") if (userRole == "管理员")
{ {
userRole = "admin"; userRole = "admin";
......
...@@ -502,7 +502,7 @@ const UserManage = () => { ...@@ -502,7 +502,7 @@ const UserManage = () => {
disabled={uploadButtonDisable} disabled={uploadButtonDisable}
showUploadList={false} showUploadList={false}
> >
{uploadButtonDisable ? <Button color='white'><Loading /></Button> : <Button icon={<UploadOutlined /> }>Excel表格添加账号</Button>} {uploadButtonDisable ? <Button color='white'><Loading /></Button> : <div style={{color: 'red'}}><Button icon={<UploadOutlined />}>Excel表格添加账号</Button></div>}
</Upload>, </Upload>,
<Button <Button
key="button" key="button"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment