组织结构实体修改

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/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 = "") 
@@ -75,18 +76,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 +122,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/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},