Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
C
chatGLM
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
刘坚-丰林-DEV
chatGLM
Commits
fd481bdf
Commit
fd481bdf
authored
May 10, 2023
by
文旺-丰林-DEV
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'uploadFile' into 'master'
fix create password and update upload_style See merge request
!5
parents
40c38579
a4cbb71b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
.gitignore
.gitignore
+1
-0
UsersAppService.cs
...-core/src/BBM.ChatGLM.Application/User/UsersAppService.cs
+1
-1
index.tsx
react/src/pages/UserManage/index.tsx
+1
-1
No files found.
.gitignore
View file @
fd481bdf
...
...
@@ -329,3 +329,4 @@ node_modules
*.txt
/aspnet-core/src/BBM.ChatGLM.Application/User/UsersAppService.cs
aspnet-core/src/BBM.ChatGLM.Application/User/UsersAppService.cs
View file @
fd481bdf
...
...
@@ -240,7 +240,7 @@ namespace BBM.ChatGLM.User
}
else
{
var
password
=
"Zs
.
"
+
phoneNumber
.
Substring
(
phoneNumber
.
Length
-
6
);
var
password
=
"Zs"
+
phoneNumber
.
Substring
(
phoneNumber
.
Length
-
6
);
if
(
userRole
==
"管理员"
)
{
userRole
=
"admin"
;
...
...
react/src/pages/UserManage/index.tsx
View file @
fd481bdf
...
...
@@ -502,7 +502,7 @@ const UserManage = () => {
disabled=
{
uploadButtonDisable
}
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
>,
<
Button
key=
"button"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment