src/main/java/com/ycl/jxkg/controller/admin/UserController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/ycl/jxkg/domain/vo/admin/user/UserCreateVO.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/ycl/jxkg/controller/admin/UserController.java
@@ -31,6 +31,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; import java.util.Objects; import java.util.UUID; import java.util.stream.Collectors; @@ -117,17 +118,9 @@ return new Result<>(3, "密码不能为空"); } } if (StringUtils.isBlank(model.getBirthDay())) { model.setBirthDay(null); } User user = new User(); BeanUtils.copyProperties(model, user); user.setAge(model.getAge()); try { user.setBirthDay(new SimpleDateFormat("yyyy-MM-dd").parse(model.getBirthDay())); } catch (ParseException e) { throw new RuntimeException(e); } if (model.getId() == null) { String encodePwd = authenticationService.pwdEncode(model.getPassword()); src/main/java/com/ycl/jxkg/domain/vo/admin/user/UserCreateVO.java
@@ -2,9 +2,11 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import javax.validation.constraints.NotBlank; import java.util.Date; @Data public class UserCreateVO { @@ -25,7 +27,8 @@ private Integer sex; private String birthDay; @JsonFormat(pattern = "yyyy-MM-dd") private Date birthDay; private String phone;