From 71f3101370c3db0ec00178d51a723816c9bcddbd Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 18 三月 2023 17:42:14 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/java/com/ycl/dto/user/UmsUserDto1.java | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/dto/UmsUserDto.java b/ycl-common/src/main/java/com/ycl/dto/user/UmsUserDto1.java
similarity index 73%
copy from ycl-common/src/main/java/com/ycl/dto/UmsUserDto.java
copy to ycl-common/src/main/java/com/ycl/dto/user/UmsUserDto1.java
index 7b7ce19..626e90b 100644
--- a/ycl-common/src/main/java/com/ycl/dto/UmsUserDto.java
+++ b/ycl-common/src/main/java/com/ycl/dto/user/UmsUserDto1.java
@@ -1,22 +1,16 @@
-package com.ycl.dto;
+package com.ycl.dto.user;
import com.alibaba.excel.annotation.ExcelProperty;
-import com.ycl.entity.depart.UmsDepart;
-import com.ycl.entity.user.UmsRole;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
-import java.util.Date;
-import java.util.List;
-
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
-public class UmsUserDto {
-
+public class UmsUserDto1 {
@ExcelProperty(value = "鐢ㄦ埛ID", index = 0)
private Long id;
@@ -30,17 +24,17 @@
private String mobile;
@ExcelProperty(value = "鎵�灞炶鑹�", index = 4)
- private List<UmsRole> roles;
+ private String roles;
@ExcelProperty(value = "鎵�灞為儴闂�", index = 5)
- private List<UmsDepart> depart;
+ private String depart;
@ExcelProperty(value = "鎵�灞炶亴鍔�", index = 6)
private String jobTitle;
@ExcelProperty(value = "鍒涘缓鏃堕棿", index = 7)
- private Date createTime;
+ private String createTime;
@ExcelProperty(value = "鏄惁鍚敤", index = 8)
- private Integer status;
+ private String status;
}
--
Gitblit v1.8.0