Commit 96cef4db authored by liqin's avatar liqin 💬

bug fixed

parent e3190d5d
...@@ -2,6 +2,7 @@ package cn.wisenergy.chnmuseum.party.model; ...@@ -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.Add;
import cn.wisenergy.chnmuseum.party.common.validator.groups.Update; import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -57,12 +58,14 @@ public class TUser implements Serializable { ...@@ -57,12 +58,14 @@ public class TUser implements Serializable {
@NotBlank(message = "用户名不能为空", groups = {Add.class, Update.class}) @NotBlank(message = "用户名不能为空", groups = {Add.class, Update.class})
private String userName; private String userName;
@ApiModelProperty(hidden = true)
@TableField("password_hash") @TableField("password_hash")
@NotNull(message = "不能为空", groups = {Add.class}) @JSONField(serialize = false)
private byte[] passwordHash; private byte[] passwordHash;
@ApiModelProperty(hidden = true)
@TableField("password_salt") @TableField("password_salt")
@NotNull(message = "不能为空", groups = {Add.class}) @JSONField(serialize = false)
private byte[] passwordSalt; private byte[] passwordSalt;
@ApiModelProperty("创建时间") @ApiModelProperty("创建时间")
......
...@@ -149,7 +149,8 @@ public class ExhibitionBoardCatController extends BaseController { ...@@ -149,7 +149,8 @@ public class ExhibitionBoardCatController extends BaseController {
List<ExhibitionBoardCat> exhibitionBoardCatList = exhibitionBoardCatService.list(exhibitionBoardCatLambdaQueryWrapper); List<ExhibitionBoardCat> exhibitionBoardCatList = exhibitionBoardCatService.list(exhibitionBoardCatLambdaQueryWrapper);
return getResult(exhibitionBoardCatList); return getResult(exhibitionBoardCatList);
} }
return getResult(""); List<ExhibitionBoardCat> exhibitionBoardCatList = exhibitionBoardCatService.list(exhibitionBoardCatLambdaQueryWrapper);
return getResult(exhibitionBoardCatList);
} }
@ApiImplicitParams(value = { @ApiImplicitParams(value = {
......
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