From bcae7b3ff3944d9f9ec894af1fe742bd172cc471 Mon Sep 17 00:00:00 2001
From: fangcheng <fangcheng@lymsh.com>
Date: Fri, 10 Mar 2017 16:39:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E5=92=8C?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/cm/dao/sys/SysRolesMapper.xml    |  13 +--
 .../main/java/com/lyms/cm/entity/sys/SysRoles.java | 119 ++++++++++++---------
 .../src/main/webapp/WEB-INF/views/login/login.html |   3 +-
 3 files changed, 75 insertions(+), 60 deletions(-)

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 column="ID" property="id" />
 		<result column="TYPE" property="type" />
 		<result column="NAME" property="name" />
-		<result column="PUBLISH_ID" property="publishId" />
-		<result column="ENABLE" property="enable" />
-		<result column="IFDEL" property="ifdel" />
 		<result column="REMARKS" property="remarks" />
 		<result column="SHORT_CODE" property="shortCode" />
 		<result column="ORG_ID" property="orgId" />
-		<result column="CREATED" property="created" />
-		<result column="MODIFIED" property="modified" />
+		<result column="CREATE_ID" property="createId" />
+		<result column="CREATE_TIME" property="createTime" />
+		<result column="MODIFY_ID" property="modifyId" />
+		<result column="MODIFY_TIME" property="modifyTime" />
+		<result column="IFDEL" property="ifdel" />
+		<result column="ENABLE" property="enable" />
 	</resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        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
     </sql>
 </mapper>
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;
  * </p>
  *
  * @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 @@
 	        <div id="id_password">
 	            <input name="password" class="form-control border" placeholder="密码" type="password" data-required>
 	        </div>
+	        <!-- 
 	        <div class="form-group form-inline">
 				 <input type="hidden" id="captcha_token" name="captcha_token" value="$!{captcha_token}">
                  <input type="text" id="captcha" name="captcha" class="form-control border" style="width: 175px;" placeholder="验证码" required="" maxlength="4">
@@ -65,7 +66,7 @@
 	                <input type="checkbox" name="rememberMe" value="1"> 记住登录？
 	            </label>
 	        </div>
-	
+	 		-->
 	        <div style="margin-top: 15px;">
 	        	<button id="loginButton" type="button" class="btn btn-success border" style="width:100%;">登 录</button>
 	        </div>
-- 
1.8.3.1