diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolesMapper.xml b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolesMapper.xml index 9916a26..c343f7c 100644 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolesMapper.xml +++ b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolesMapper.xml @@ -7,18 +7,19 @@ - - - - - + + + + + + - ID AS id, TYPE AS type, NAME AS name, PUBLISH_ID AS publishId, ENABLE AS enable, IFDEL AS ifdel, REMARKS AS remarks, SHORT_CODE AS shortCode, ORG_ID AS orgId, CREATED AS created, MODIFIED AS modified + ID AS id, TYPE AS type, NAME AS name, REMARKS AS remarks, SHORT_CODE AS shortCode, ORG_ID AS orgId, CREATE_ID AS createId, CREATE_TIME AS createTime, MODIFY_ID AS modifyId, MODIFY_TIME AS modifyTime, IFDEL AS ifdel, ENABLE AS enable diff --git a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysRoles.java b/center.manager/src/main/java/com/lyms/cm/entity/sys/SysRoles.java index 99a1134..8fa48ff 100644 --- a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysRoles.java +++ b/center.manager/src/main/java/com/lyms/cm/entity/sys/SysRoles.java @@ -1,8 +1,8 @@ package com.lyms.cm.entity.sys; import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; import java.io.Serializable; import java.util.Date; @@ -12,7 +12,7 @@ import java.util.Date; *

* * @author fangcheng - * @since 2017-03-07 + * @since 2017-03-10 */ @TableName("SYS_ROLES") public class SysRoles implements Serializable { @@ -35,21 +35,6 @@ public class SysRoles implements Serializable { @TableField(value="NAME") private String name; /** - * - */ - @TableField(value="PUBLISH_ID") - private String publishId; - /** - * 1:启用,2:停用 - */ - @TableField(value="ENABLE") - private Integer enable; - /** - * 1:有效,2:无效 - */ - @TableField(value="IFDEL") - private Integer ifdel; - /** * 备注 */ @TableField(value="REMARKS") @@ -67,13 +52,33 @@ public class SysRoles implements Serializable { /** * */ - @TableField(value="CREATED") - private Date created; + @TableField(value="CREATE_ID") + private String createId; + /** + * + */ + @TableField(value="CREATE_TIME") + private Date createTime; + /** + * + */ + @TableField(value="MODIFY_ID") + private String modifyId; /** * */ - @TableField(value="MODIFIED") - private Date modified; + @TableField(value="MODIFY_TIME") + private Date modifyTime; + /** + * + */ + @TableField(value="IFDEL") + private Integer ifdel; + /** + * + */ + @TableField(value="ENABLE") + private Integer enable; public String getId() { @@ -100,30 +105,6 @@ public class SysRoles implements Serializable { this.name = name; } - public String getPublishId() { - return publishId; - } - - public void setPublishId(String publishId) { - this.publishId = publishId; - } - - public Integer getEnable() { - return enable; - } - - public void setEnable(Integer enable) { - this.enable = enable; - } - - public Integer getIfdel() { - return ifdel; - } - - public void setIfdel(Integer ifdel) { - this.ifdel = ifdel; - } - public String getRemarks() { return remarks; } @@ -148,20 +129,52 @@ public class SysRoles implements Serializable { this.orgId = orgId; } - public Date getCreated() { - return created; + public String getCreateId() { + return createId; + } + + public void setCreateId(String createId) { + this.createId = createId; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; } - public void setCreated(Date created) { - this.created = created; + public String getModifyId() { + return modifyId; } - public Date getModified() { - return modified; + public void setModifyId(String modifyId) { + this.modifyId = modifyId; } - public void setModified(Date modified) { - this.modified = modified; + public Date getModifyTime() { + return modifyTime; + } + + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + public Integer getIfdel() { + return ifdel; + } + + public void setIfdel(Integer ifdel) { + this.ifdel = ifdel; + } + + public Integer getEnable() { + return enable; + } + + public void setEnable(Integer enable) { + this.enable = enable; } } diff --git a/center.manager/src/main/webapp/WEB-INF/views/login/login.html b/center.manager/src/main/webapp/WEB-INF/views/login/login.html index 5349b4e..74a6de2 100644 --- a/center.manager/src/main/webapp/WEB-INF/views/login/login.html +++ b/center.manager/src/main/webapp/WEB-INF/views/login/login.html @@ -55,6 +55,7 @@
+