|
@@ -28,9 +28,7 @@ import javax.validation.constraints.Email;
|
|
|
import javax.validation.constraints.NotBlank;
|
|
|
import javax.validation.constraints.NotNull;
|
|
|
import java.io.Serializable;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.Objects;
|
|
|
-import java.util.Set;
|
|
|
+import java.util.*;
|
|
|
|
|
|
/**
|
|
|
* @author Zheng Jie
|
|
@@ -149,6 +147,8 @@ public class User extends BaseEntity implements Serializable {
|
|
|
@ApiModelProperty(value = "根用户组名称", hidden = true)
|
|
|
private String userRootGroupName;
|
|
|
|
|
|
+ @Transient
|
|
|
+ private List<Map<String,Object>> userMenu;
|
|
|
|
|
|
@Override
|
|
|
public boolean equals(Object o) {
|