Merge remote-tracking branch 'origin/master'

src/main/java/com/gyee/frame/model/auto/Gyeeorgan.java

@@ -1,9 +1,10 @@
 package com.gyee.frame.model.auto;
 
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.io.Serializable;
+
 
 /**
  *  Gyeeorgan 
@@ -27,7 +28,7 @@ private String name;
 		
 	/**  **/
 	@ApiModelProperty(value = "") 
-private String describes;
+private String descr;
 		
 	/**  **/
 	@ApiModelProperty(value = "") 
@@ -50,18 +51,16 @@ private String type;
     public void setName(String name) {
         this.name = name;
     }
-	 
-			
-	public String getDescribes() {
-        return describes;
+
+    public String getDescr() {
+        return descr;
     }
 
-    public void setDescribes(String describes) {
-        this.describes = describes;
+    public void setDescr(String descr) {
+        this.descr = descr;
     }
-	 
-			
-	public String getType() {
+
+    public String getType() {
         return type;
     }
 
@@ -75,11 +74,11 @@ private String type;
     }
     
 																						
-	public Gyeeorgan(String id,String name,String describes,String type) {
+	public Gyeeorgan(String id,String name,String descr,String type) {
 	
 		this.id = id;
 		this.name = name;
-		this.describes = describes;
+		this.descr = descr;
 		this.type = type;
 		
 	}

src/main/java/com/gyee/frame/model/auto/GyeeorganExample.java

@@ -1,8 +1,6 @@
 package com.gyee.frame.model.auto;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -255,73 +253,73 @@ public class GyeeorganExample {
         }
         
 			
-        public Criteria andDescribesIsNull() {
-            addCriterion("describes is null");
+        public Criteria andDescrIsNull() {
+            addCriterion("descr is null");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesIsNotNull() {
-            addCriterion("describes is not null");
+        public Criteria andDescrIsNotNull() {
+            addCriterion("descr is not null");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesEqualTo(String value) {
-            addCriterion("describes =", value, "describes");
+        public Criteria andDescrEqualTo(String value) {
+            addCriterion("descr =", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesNotEqualTo(String value) {
-            addCriterion("describes <>", value, "describes");
+        public Criteria andDescrNotEqualTo(String value) {
+            addCriterion("descr <>", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesGreaterThan(String value) {
-            addCriterion("describes >", value, "describes");
+        public Criteria andDescrGreaterThan(String value) {
+            addCriterion("descr >", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesGreaterThanOrEqualTo(String value) {
-            addCriterion("describes >=", value, "describes");
+        public Criteria andDescrGreaterThanOrEqualTo(String value) {
+            addCriterion("descr >=", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesLessThan(String value) {
-            addCriterion("describes <", value, "describes");
+        public Criteria andDescrLessThan(String value) {
+            addCriterion("descr <", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesLessThanOrEqualTo(String value) {
-            addCriterion("describes <=", value, "describes");
+        public Criteria andDescrLessThanOrEqualTo(String value) {
+            addCriterion("descr <=", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesLike(String value) {
-            addCriterion("describes like", value, "describes");
+        public Criteria andDescrLike(String value) {
+            addCriterion("descr like", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesNotLike(String value) {
-            addCriterion("describes not like", value, "describes");
+        public Criteria andDescrNotLike(String value) {
+            addCriterion("descr not like", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesIn(List<String> values) {
-            addCriterion("describes in", values, "describes");
+        public Criteria andDescrIn(List<String> values) {
+            addCriterion("descr in", values, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesNotIn(List<String> values) {
-            addCriterion("describes not in", values, "describes");
+        public Criteria andDescrNotIn(List<String> values) {
+            addCriterion("descr not in", values, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesBetween(String value1, String value2) {
-            addCriterion("describes between", value1, value2, "describes");
+        public Criteria andDescrBetween(String value1, String value2) {
+            addCriterion("descr between", value1, value2, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesNotBetween(String value1, String value2) {
-            addCriterion("describes not between", value1, value2, "describes");
+        public Criteria andDescrNotBetween(String value1, String value2) {
+            addCriterion("descr not between", value1, value2, "descr");
             return (Criteria) this;
         }
         

src/main/java/com/gyee/frame/model/auto/Gyeepermission.java

@@ -1,9 +1,10 @@
 package com.gyee.frame.model.auto;
 
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.io.Serializable;
+
 
 /**
  *  Gyeepermission 
@@ -31,7 +32,7 @@ private String permisssionname;
 		
 	/**  **/
 	@ApiModelProperty(value = "") 
-private String describes;
+private String descr;
 		
 	/**  **/
 	@ApiModelProperty(value = "") 
@@ -48,9 +49,16 @@ private String parent;
 	/**  **/
 	@ApiModelProperty(value = "") 
 private String isable;
-		
-		
-	public String getId() {
+
+    public String getDescr() {
+        return descr;
+    }
+
+    public void setDescr(String descr) {
+        this.descr = descr;
+    }
+
+    public String getId() {
         return id;
     }
 
@@ -75,18 +83,12 @@ private String isable;
     public void setPermisssionname(String permisssionname) {
         this.permisssionname = permisssionname;
     }
-	 
-			
-	public String getDescribes() {
-        return describes;
-    }
 
-    public void setDescribes(String describes) {
-        this.describes = describes;
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
     }
-	 
-			
-	public String getRemark1() {
+
+    public String getRemark1() {
         return remark1;
     }
 
@@ -127,12 +129,12 @@ private String isable;
     }
     
 																																										
-	public Gyeepermission(String id,String permisssionlevel,String permisssionname,String describes,String remark1,String remark2,String parent,String isable) {
+	public Gyeepermission(String id,String permisssionlevel,String permisssionname,String descr,String remark1,String remark2,String parent,String isable) {
 	
 		this.id = id;
 		this.permisssionlevel = permisssionlevel;
 		this.permisssionname = permisssionname;
-		this.describes = describes;
+		this.descr = descr;
 		this.remark1 = remark1;
 		this.remark2 = remark2;
 		this.parent = parent;

src/main/java/com/gyee/frame/model/auto/GyeepermissionExample.java

@@ -1,8 +1,6 @@
 package com.gyee.frame.model.auto;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -326,73 +324,73 @@ public class GyeepermissionExample {
         }
         
 			
-        public Criteria andDescribesIsNull() {
-            addCriterion("describes is null");
+        public Criteria andDescrIsNull() {
+            addCriterion("descr is null");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesIsNotNull() {
-            addCriterion("describes is not null");
+        public Criteria andDescrIsNotNull() {
+            addCriterion("descr is not null");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesEqualTo(String value) {
-            addCriterion("describes =", value, "describes");
+        public Criteria andDescrEqualTo(String value) {
+            addCriterion("descr =", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesNotEqualTo(String value) {
-            addCriterion("describes <>", value, "describes");
+        public Criteria andDescrNotEqualTo(String value) {
+            addCriterion("descr <>", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesGreaterThan(String value) {
-            addCriterion("describes >", value, "describes");
+        public Criteria andDescrGreaterThan(String value) {
+            addCriterion("descr >", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesGreaterThanOrEqualTo(String value) {
-            addCriterion("describes >=", value, "describes");
+        public Criteria andDescrGreaterThanOrEqualTo(String value) {
+            addCriterion("descr >=", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesLessThan(String value) {
-            addCriterion("describes <", value, "describes");
+        public Criteria andDescrLessThan(String value) {
+            addCriterion("descr <", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesLessThanOrEqualTo(String value) {
-            addCriterion("describes <=", value, "describes");
+        public Criteria andDescrLessThanOrEqualTo(String value) {
+            addCriterion("descr <=", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesLike(String value) {
-            addCriterion("describes like", value, "describes");
+        public Criteria andDescrLike(String value) {
+            addCriterion("descr like", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesNotLike(String value) {
-            addCriterion("describes not like", value, "describes");
+        public Criteria andDescrNotLike(String value) {
+            addCriterion("descr not like", value, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesIn(List<String> values) {
-            addCriterion("describes in", values, "describes");
+        public Criteria andDescrIn(List<String> values) {
+            addCriterion("descr in", values, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesNotIn(List<String> values) {
-            addCriterion("describes not in", values, "describes");
+        public Criteria andDescrNotIn(List<String> values) {
+            addCriterion("descr not in", values, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesBetween(String value1, String value2) {
-            addCriterion("describes between", value1, value2, "describes");
+        public Criteria andDescrBetween(String value1, String value2) {
+            addCriterion("descr between", value1, value2, "descr");
             return (Criteria) this;
         }
 
-        public Criteria andDescribesNotBetween(String value1, String value2) {
-            addCriterion("describes not between", value1, value2, "describes");
+        public Criteria andDescrNotBetween(String value1, String value2) {
+            addCriterion("descr not between", value1, value2, "descr");
             return (Criteria) this;
         }
         

src/main/java/com/gyee/frame/model/auto/GyeepermissionView.java

@@ -1,9 +1,9 @@
 package com.gyee.frame.model.auto;
 
-import java.util.List;
-
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.List;
+
 public class GyeepermissionView {
 	/**  **/
 	@ApiModelProperty(value = "") 
@@ -64,11 +64,11 @@ private List<GyeepermissionView> GyeePermissionList;
 		this.permisssionname = permisssionname;
 	}
 
-	public String getDescribes() {
+	public String getDescr() {
 		return describes;
 	}
 
-	public void setDescribes(String describes) {
+	public void setDescr(String describes) {
 		this.describes = describes;
 	}
 

src/main/java/com/gyee/frame/service/GyeeorganService.java

@@ -1,9 +1,5 @@
 package com.gyee.frame.service;
 
-import java.util.List;
-import java.util.Arrays;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.gyee.frame.common.base.BaseService;
@@ -13,6 +9,10 @@ import com.gyee.frame.model.auto.Gyeeorgan;
 import com.gyee.frame.model.auto.GyeeorganExample;
 import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.util.SnowflakeIdWorker;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
 
 /**
  *  GyeeorganService
@@ -24,21 +24,19 @@ import com.gyee.frame.util.SnowflakeIdWorker;
  **/
 @Service
 public class GyeeorganService implements BaseService<Gyeeorgan, GyeeorganExample>{
-	@Autowired
+	@Resource
 	private GyeeorganMapper gyeeorganMapper;
 	
       	   	      	      	      	      	
 	/**
 	 * 分页查询
-	 * @param pageNum
-	 * @param pageSize
 	 * @return
 	 */
 	 public PageInfo<Gyeeorgan> list(Tablepar tablepar,String name){
 	        GyeeorganExample testExample=new GyeeorganExample();
 	        testExample.setOrderByClause("id ASC");
 	        if(name!=null&&!"".equals(name)){
-	        	testExample.createCriteria().andDescribesLike("%"+name+"%");
+	        	testExample.createCriteria().andDescrLike("%"+name+"%");
 	        }
 
 	        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
@@ -127,7 +125,7 @@ public class GyeeorganService implements BaseService<Gyeeorgan, GyeeorganExample
 	 */
 	public int checkNameUnique(Gyeeorgan gyeeorgan){
 		GyeeorganExample example=new GyeeorganExample();
-		example.createCriteria().andDescribesEqualTo(gyeeorgan.getDescribes());
+		example.createCriteria().andDescrEqualTo(gyeeorgan.getDescr());
 		List<Gyeeorgan> list=gyeeorganMapper.selectByExample(example);
 		return list.size();
 	}

src/main/java/com/gyee/frame/service/GyeepermissionService.java

@@ -1,10 +1,5 @@
 package com.gyee.frame.service;
 
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Arrays;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.gyee.frame.common.base.BaseService;
@@ -15,6 +10,11 @@ import com.gyee.frame.model.auto.GyeepermissionExample;
 import com.gyee.frame.model.auto.GyeepermissionView;
 import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.util.SnowflakeIdWorker;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  *  GyeepermissionService
@@ -26,14 +26,12 @@ import com.gyee.frame.util.SnowflakeIdWorker;
  **/
 @Service
 public class GyeepermissionService implements BaseService<Gyeepermission, GyeepermissionExample>{
-	@Autowired
+	@Resource
 	private GyeepermissionMapper gyeepermissionMapper;
 	
       	   	      	      	      	      	      	      	      	      	
 	/**
 	 * 分页查询
-	 * @param pageNum
-	 * @param pageSize
 	 * @return
 	 */
 	 public PageInfo<Gyeepermission> list(Tablepar tablepar,String name){
@@ -156,7 +154,7 @@ public class GyeepermissionService implements BaseService<Gyeepermission, Gyeepe
 				gyeePermissionView.setId(allList.get(i).getId());
 				gyeePermissionView.setPermisssionlevel(allList.get(i).getPermisssionlevel());
 				gyeePermissionView.setPermisssionname(allList.get(i).getPermisssionname());
-				gyeePermissionView.setDescribes(allList.get(i).getDescribes());
+				gyeePermissionView.setDescr(allList.get(i).getDescr());
 				gyeePermissionView.setRemark1(allList.get(i).getRemark1());
 				gyeePermissionView.setRemark2(allList.get(i).getRemark2());
 				gyeePermissionView.setParent(allList.get(i).getParent());
@@ -192,7 +190,7 @@ public class GyeepermissionService implements BaseService<Gyeepermission, Gyeepe
 				gyeePermissionView.setId(allList.get(i).getId());
 				gyeePermissionView.setPermisssionlevel(allList.get(i).getPermisssionlevel());
 				gyeePermissionView.setPermisssionname(allList.get(i).getPermisssionname());
-				gyeePermissionView.setDescribes(allList.get(i).getDescribes());
+				gyeePermissionView.setDescr(allList.get(i).getDescr());
 				gyeePermissionView.setRemark1(allList.get(i).getRemark1());
 				gyeePermissionView.setRemark2(allList.get(i).getRemark2());
 				gyeePermissionView.setParent(allList.get(i).getParent());

src/main/resources/mybatis/auto/GyeeorganMapper.xml

@@ -4,7 +4,7 @@
   <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Gyeeorgan">
     <result column="id" jdbcType="VARCHAR" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="describes" jdbcType="VARCHAR" property="describes" />
+    <result column="descr" jdbcType="VARCHAR" property="descr" />
     <result column="type" jdbcType="VARCHAR" property="type" />
   </resultMap>
   <sql id="Example_Where_Clause">
@@ -68,7 +68,7 @@
 <sql id="Base_Column_List">
 	  	  	      	id,
        	  	      	name,
-       	  	      	describes,
+       	  	      	descr,
        	  	    	  	type
        	</sql>
   <select id="selectByExample" parameterType="com.gyee.frame.model.auto.GyeeorganExample" resultMap="BaseResultMap">
@@ -107,13 +107,13 @@
     insert into gyeeorgan (
       	  	       id,
        	  	       name,
-       	  	       describes,
+       	  	       descr,
        	  	    	  type
        	    )
     values (
 	  	  	      	#{id,jdbcType=VARCHAR},
        	  	      	#{name,jdbcType=VARCHAR},
-       	  	      	#{describes,jdbcType=VARCHAR},
+       	  	      	#{descr,jdbcType=VARCHAR},
        	  	    	  #{type,jdbcType=VARCHAR}
        	    )
   </insert>
@@ -132,8 +132,8 @@
       </if>
       
          
-      <if test="describes != null">
-        describes,
+      <if test="descr != null">
+        descr,
       </if>
       
          
@@ -149,8 +149,8 @@
           <if test="name != null">
         #{name,jdbcType=VARCHAR},
       </if>
-          <if test="describes != null">
-        #{describes,jdbcType=VARCHAR},
+          <if test="descr != null">
+        #{descr,jdbcType=VARCHAR},
       </if>
           <if test="type != null">
         #{type,jdbcType=VARCHAR},
@@ -174,8 +174,8 @@
           <if test="record.name != null">
         name = #{record.name,jdbcType=VARCHAR},
       </if>
-          <if test="record.describes != null">
-        describes = #{record.describes,jdbcType=VARCHAR},
+          <if test="record.descr != null">
+        descr = #{record.descr,jdbcType=VARCHAR},
       </if>
           <if test="record.type != null">
         type = #{record.type,jdbcType=VARCHAR},
@@ -193,7 +193,7 @@
     set
             	     	 id = #{record.id,jdbcType=VARCHAR},
     	         	     	 name = #{record.name,jdbcType=VARCHAR},
-    	         	     	 describes = #{record.describes,jdbcType=VARCHAR},
+    	         	     	 descr = #{record.descr,jdbcType=VARCHAR},
     	         	     	 type = #{record.type,jdbcType=VARCHAR}
     	         <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -207,8 +207,8 @@
                           <if test="name != null">
         name = #{name,jdbcType=VARCHAR},
       </if>
-                      <if test="describes != null">
-        describes = #{describes,jdbcType=VARCHAR},
+                      <if test="descr != null">
+        descr = #{descr,jdbcType=VARCHAR},
       </if>
                       <if test="type != null">
         type = #{type,jdbcType=VARCHAR},
@@ -225,7 +225,7 @@
     update gyeeorgan
     set 
              	        	    	 			name = #{name,jdbcType=VARCHAR},
-		     	        	    	 			describes = #{describes,jdbcType=VARCHAR},
+		     	        	    	 			descr = #{descr,jdbcType=VARCHAR},
 		     	        	    	 			type = #{type,jdbcType=VARCHAR}
 		     	        where 
             id = #{id,jdbcType=VARCHAR}

src/main/resources/mybatis/auto/GyeepermissionMapper.xml

@@ -5,7 +5,7 @@
     <result column="id" jdbcType="VARCHAR" property="id" />
     <result column="permisssionlevel" jdbcType="VARCHAR" property="permisssionlevel" />
     <result column="permisssionname" jdbcType="VARCHAR" property="permisssionname" />
-    <result column="describes" jdbcType="VARCHAR" property="describes" />
+    <result column="descr" jdbcType="VARCHAR" property="descr" />
     <result column="remark1" jdbcType="VARCHAR" property="remark1" />
     <result column="remark2" jdbcType="VARCHAR" property="remark2" />
     <result column="parent" jdbcType="VARCHAR" property="parent" />
@@ -73,7 +73,7 @@
 	  	  	      	id,
        	  	      	permisssionlevel,
        	  	      	permisssionname,
-       	  	      	describes,
+       	  	      	descr,
        	  	      	remark1,
        	  	      	remark2,
        	  	      	parent,
@@ -116,7 +116,7 @@
       	  	       id,
        	  	       permisssionlevel,
        	  	       permisssionname,
-       	  	       describes,
+       	  	       descr,
        	  	       remark1,
        	  	       remark2,
        	  	       parent,
@@ -126,7 +126,7 @@
 	  	  	      	#{id,jdbcType=VARCHAR},
        	  	      	#{permisssionlevel,jdbcType=VARCHAR},
        	  	      	#{permisssionname,jdbcType=VARCHAR},
-       	  	      	#{describes,jdbcType=VARCHAR},
+       	  	      	#{descr,jdbcType=VARCHAR},
        	  	      	#{remark1,jdbcType=VARCHAR},
        	  	      	#{remark2,jdbcType=VARCHAR},
        	  	      	#{parent,jdbcType=VARCHAR},
@@ -153,8 +153,8 @@
       </if>
       
          
-      <if test="describes != null">
-        describes,
+      <if test="descr != null">
+        descr,
       </if>
       
          
@@ -188,8 +188,8 @@
           <if test="permisssionname != null">
         #{permisssionname,jdbcType=VARCHAR},
       </if>
-          <if test="describes != null">
-        #{describes,jdbcType=VARCHAR},
+          <if test="descr != null">
+        #{descr,jdbcType=VARCHAR},
       </if>
           <if test="remark1 != null">
         #{remark1,jdbcType=VARCHAR},
@@ -225,8 +225,8 @@
           <if test="record.permisssionname != null">
         permisssionname = #{record.permisssionname,jdbcType=VARCHAR},
       </if>
-          <if test="record.describes != null">
-        describes = #{record.describes,jdbcType=VARCHAR},
+          <if test="record.descr != null">
+        descr = #{record.descr,jdbcType=VARCHAR},
       </if>
           <if test="record.remark1 != null">
         remark1 = #{record.remark1,jdbcType=VARCHAR},
@@ -254,7 +254,7 @@
             	     	 id = #{record.id,jdbcType=VARCHAR},
     	         	     	 permisssionlevel = #{record.permisssionlevel,jdbcType=VARCHAR},
     	         	     	 permisssionname = #{record.permisssionname,jdbcType=VARCHAR},
-    	         	     	 describes = #{record.describes,jdbcType=VARCHAR},
+    	         	     	 descr = #{record.descr,jdbcType=VARCHAR},
     	         	     	 remark1 = #{record.remark1,jdbcType=VARCHAR},
     	         	     	 remark2 = #{record.remark2,jdbcType=VARCHAR},
     	         	     	 parent = #{record.parent,jdbcType=VARCHAR},
@@ -274,8 +274,8 @@
                       <if test="permisssionname != null">
         permisssionname = #{permisssionname,jdbcType=VARCHAR},
       </if>
-                      <if test="describes != null">
-        describes = #{describes,jdbcType=VARCHAR},
+                      <if test="descr != null">
+        descr = #{descr,jdbcType=VARCHAR},
       </if>
                       <if test="remark1 != null">
         remark1 = #{remark1,jdbcType=VARCHAR},
@@ -302,7 +302,7 @@
     set 
              	        	    	 			permisssionlevel = #{permisssionlevel,jdbcType=VARCHAR},
 		     	        	    	 			permisssionname = #{permisssionname,jdbcType=VARCHAR},
-		     	        	    	 			describes = #{describes,jdbcType=VARCHAR},
+		     	        	    	 			descr = #{descr,jdbcType=VARCHAR},
 		     	        	    	 			remark1 = #{remark1,jdbcType=VARCHAR},
 		     	        	    	 			remark2 = #{remark2,jdbcType=VARCHAR},
 		     	        	    	 			parent = #{parent,jdbcType=VARCHAR},