用户管理模块

1、用户类型添加
2、新增vpn服务器ip修改

src/main/java/com/nis/web/dao/configuration/UserManageDao.xml

@@ -7,6 +7,7 @@
 		<result column="user_name" property="userName" jdbcType="VARCHAR"/>
 		<result column="user_pwd" property="userPwd" jdbcType="VARCHAR"/>
 		<result column="server_ip" property="serverIp" jdbcType="VARCHAR"/>
+		<result column="user_type" property="userType" jdbcType="VARCHAR"/>
 		<result column="is_valid" property="isValid" jdbcType="INTEGER"/>
 		<result column="is_audit" property="isAudit" jdbcType="INTEGER" />
 		<result column="creator_id" property="creatorId" jdbcType="INTEGER" />
@@ -17,7 +18,7 @@
 	</resultMap>
 	
 	<sql id="Columns">
-		r.ID,r.USER_NAME,r.USER_PWD,r.SERVER_IP,r.is_audit,
+		r.ID,r.USER_NAME,r.USER_PWD,r.SERVER_IP,r.user_type,r.is_audit,
 		r.IS_VALID,r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,remarks
 	</sql>
 	
@@ -46,6 +47,9 @@
 	    	<if test="serverIp != null and serverIp != ''">
 	    		AND r.server_ip like concat(concat('%',#{serverIp,jdbcType=VARCHAR}),'%') 
 	    	</if>
+	    	<if test="userType != null and userType != ''">
+	    		AND r.user_type =#{userType,jdbcType=VARCHAR}
+	    	</if>
 	    	<if test="remarks != null and remarks != ''">
 	    		AND r.remarks like concat(concat('%',#{remarks,jdbcType=VARCHAR}),'%') 
 	    	</if>
@@ -74,6 +78,7 @@
 			USER_NAME,
 			USER_PWD,
 			SERVER_IP,
+			user_type,
 			IS_VALID,
 			is_audit,
 			CREATOR_ID,
@@ -85,6 +90,7 @@
 			#{userName,jdbcType=VARCHAR},
 			#{userPwd,jdbcType=VARCHAR},
 			#{serverIp,jdbcType=VARCHAR},
+			#{userType,jdbcType=VARCHAR},
    			#{isValid,jdbcType=INTEGER},
    			0,
    			#{creatorId,jdbcType=INTEGER}, 
@@ -111,6 +117,9 @@
 		      <if test="serverIp != null and serverIp != ''" >
 		        server_ip = #{serverIp,jdbcType=VARCHAR},
 		      </if>
+		      <if test="userType != null and userType != ''">
+	    		user_type =#{userType,jdbcType=VARCHAR},
+	    	  </if>
 		      <if test="creatorId != null" >
 		        creator_id = #{creatorId,jdbcType=INTEGER},
 		      </if>