~chenjialiang/moral.git

			@@ -4,14 +4,20 @@
			import com.baomidou.mybatisplus.annotation.TableField;
			import com.baomidou.mybatisplus.extension.activerecord.Model;
			import com.baomidou.mybatisplus.annotation.TableId;
			import com.fasterxml.jackson.annotation.JsonFormat;
			import com.fasterxml.jackson.annotation.JsonIgnore;
			import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
			import com.fasterxml.jackson.annotation.JsonProperty;

			import java.io.Serializable;
			import java.util.Date;
			import java.util.List;
			import java.util.Set;

			import lombok.Data;
			import lombok.EqualsAndHashCode;

			import javax.persistence.Transient;


			/**
			@@ -47,6 +53,7 @@
			/**
			* 密码
			*/
			@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
			private String password;

			/**
			@@ -77,29 +84,25 @@
			/**
			* 创建时间
			*/
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			private Date createTime;

			/**
			* 更新时间
			*/
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			private Date updateTime;

			/**
			* 过期时间
			*/
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			private Date expireTime;

			/**
			* 是否删除
			*/
			private String isDelete;


			@TableField(exist = false)
			private Set<Group> groups;

			@TableField(exist = false)
			private Set<Menu> menus;


			@Override