From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期一, 12 四月 2021 15:44:53 +0800
Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua
---
src/main/java/com/ots/project/exam/viewmodel/UserResponseVM.java | 21 ---------------------
1 files changed, 0 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/ots/project/exam/viewmodel/UserResponseVM.java b/src/main/java/com/ots/project/exam/viewmodel/UserResponseVM.java
index bf6d909..8d14f8d 100644
--- a/src/main/java/com/ots/project/exam/viewmodel/UserResponseVM.java
+++ b/src/main/java/com/ots/project/exam/viewmodel/UserResponseVM.java
@@ -1,46 +1,25 @@
package com.ots.project.exam.viewmodel;
-
import com.ots.project.exam.domain.ExamUser;
import com.ots.project.tool.exam.DateTimeUtil;
import lombok.Data;
-/**
- * @author ots
- */
-
@Data
public class UserResponseVM extends BaseVM {
-
private Integer id;
-
private String userUuid;
-
private String userName;
-
private String realName;
-
private Integer age;
-
private Integer role;
-
private Integer sex;
-
private String birthDay;
-
private String phone;
-
private String lastActiveTime;
-
private String createTime;
-
private String modifyTime;
-
private Integer status;
-
private Integer userLevel;
-
private String imagePath;
-
public static UserResponseVM from(ExamUser user) {
UserResponseVM vm = modelMapper.map(user, UserResponseVM.class);
vm.setBirthDay(DateTimeUtil.dateFormat(user.getBirthDay()));
--
Gitblit v1.9.1