Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
chnmuseum-party
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
0
Merge Requests
0
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
liqin
chnmuseum-party
Commits
96cef4db
Commit
96cef4db
authored
3 years ago
by
liqin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fixed
parent
e3190d5d
master
1.0
dev
No related merge requests found
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
TUser.java
src/main/java/cn/wisenergy/chnmuseum/party/model/TUser.java
+5
-2
ExhibitionBoardCatController.java
...um/party/web/controller/ExhibitionBoardCatController.java
+2
-1
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/model/TUser.java
View file @
96cef4db
...
...
@@ -2,6 +2,7 @@ package cn.wisenergy.chnmuseum.party.model;
import
cn.wisenergy.chnmuseum.party.common.validator.groups.Add
;
import
cn.wisenergy.chnmuseum.party.common.validator.groups.Update
;
import
com.alibaba.fastjson.annotation.JSONField
;
import
com.baomidou.mybatisplus.annotation.*
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
...
...
@@ -57,12 +58,14 @@ public class TUser implements Serializable {
@NotBlank
(
message
=
"用户名不能为空"
,
groups
=
{
Add
.
class
,
Update
.
class
})
private
String
userName
;
@ApiModelProperty
(
hidden
=
true
)
@TableField
(
"password_hash"
)
@
NotNull
(
message
=
"不能为空"
,
groups
=
{
Add
.
class
}
)
@
JSONField
(
serialize
=
false
)
private
byte
[]
passwordHash
;
@ApiModelProperty
(
hidden
=
true
)
@TableField
(
"password_salt"
)
@
NotNull
(
message
=
"不能为空"
,
groups
=
{
Add
.
class
}
)
@
JSONField
(
serialize
=
false
)
private
byte
[]
passwordSalt
;
@ApiModelProperty
(
"创建时间"
)
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardCatController.java
View file @
96cef4db
...
...
@@ -149,7 +149,8 @@ public class ExhibitionBoardCatController extends BaseController {
List
<
ExhibitionBoardCat
>
exhibitionBoardCatList
=
exhibitionBoardCatService
.
list
(
exhibitionBoardCatLambdaQueryWrapper
);
return
getResult
(
exhibitionBoardCatList
);
}
return
getResult
(
""
);
List
<
ExhibitionBoardCat
>
exhibitionBoardCatList
=
exhibitionBoardCatService
.
list
(
exhibitionBoardCatLambdaQueryWrapper
);
return
getResult
(
exhibitionBoardCatList
);
}
@ApiImplicitParams
(
value
=
{
...
...
This diff is collapsed.
Click to expand it.
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