修改编译错误

08.src/Xingxi/xingxi-generator/target/classes/mapper/generator/GenTableColumnMapper.xml

@@ -23,9 +23,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="htmlType"       column="html_type"      />
         <result property="dictType"       column="dict_type"      />
         <result property="sort"           column="sort"           />
-        <result property="createBy"       column="create_by"      />
+        <result property="createUser"       column="create_by"      />
         <result property="createTime"     column="create_time"    />
-        <result property="updateBy"       column="update_by"      />
+        <result property="updateUser"       column="update_by"      />
         <result property="updateTime"     column="update_time"    />
     </resultMap>
 	
@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="htmlType != null and htmlType != ''">html_type,</if>
 			<if test="dictType != null and dictType != ''">dict_type,</if>
 			<if test="sort != null">sort,</if>
-			<if test="createBy != null and createBy != ''">create_by,</if>
+			<if test="createUser != null and createUser != ''">create_by,</if>
 			create_time
          )values(
 			<if test="tableId != null and tableId != ''">#{tableId},</if>
@@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="htmlType != null and htmlType != ''">#{htmlType},</if>
 			<if test="dictType != null and dictType != ''">#{dictType},</if>
 			<if test="sort != null">#{sort},</if>
-			<if test="createBy != null and createBy != ''">#{createBy},</if>
+			<if test="createUser != null and createUser != ''">#{createUser},</if>
 			sysdate()
          )
     </insert>
@@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             html_type = #{htmlType},
             dict_type = #{dictType},
             sort = #{sort},
-            update_by = #{updateBy},
+            update_by = #{updateUser},
             update_time = sysdate()
         </set>
         where column_id = #{columnId}

08.src/Xingxi/xingxi-generator/target/classes/mapper/generator/GenTableMapper.xml

@@ -21,9 +21,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="genType"        column="gen_type"          />
 		<result property="genPath"        column="gen_path"          />
 		<result property="options"        column="options"           />
-		<result property="createBy"       column="create_by"         />
+		<result property="createUser"       column="create_by"         />
 		<result property="createTime"     column="create_time"       />
-		<result property="updateBy"       column="update_by"         />
+		<result property="updateUser"       column="update_by"         />
 		<result property="updateTime"     column="update_time"       />
 		<result property="remark"         column="remark"            />
 		<collection  property="columns"   javaType="java.util.List"  resultMap="GenTableColumnResult" />
@@ -48,9 +48,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="htmlType"       column="html_type"      />
         <result property="dictType"       column="dict_type"      />
         <result property="sort"           column="sort"           />
-        <result property="createBy"       column="create_by"      />
+        <result property="createUser"       column="create_by"      />
         <result property="createTime"     column="create_time"    />
-        <result property="updateBy"       column="update_by"      />
+        <result property="updateUser"       column="update_by"      />
         <result property="updateTime"     column="update_time"    />
     </resultMap>
 	
@@ -144,7 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="genType != null and genType != ''">gen_type,</if>
 			<if test="genPath != null and genPath != ''">gen_path,</if>
 			<if test="remark != null and remark != ''">remark,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
+ 			<if test="createUser != null and createUser != ''">create_by,</if>
 			create_time
          )values(
 			<if test="tableName != null">#{tableName},</if>
@@ -160,7 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="genType != null and genType != ''">#{genType},</if>
 			<if test="genPath != null and genPath != ''">#{genPath},</if>
 			<if test="remark != null and remark != ''">#{remark},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+ 			<if test="createUser != null and createUser != ''">#{createUser},</if>
 			sysdate()
          )
     </insert>
@@ -187,7 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="businessName != null and businessName != ''">business_name = #{businessName},</if>
             <if test="functionName != null and functionName != ''">function_name = #{functionName},</if>
             <if test="options != null and options != ''">options = #{options},</if>
-            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="updateUser != null and updateUser != ''">update_by = #{updateUser},</if>
             <if test="remark != null">remark = #{remark},</if>
             update_time = sysdate()
         </set>

08.src/Xingxi/xingxi-quartz/target/classes/mapper/quartz/SysJobMapper.xml

@@ -13,9 +13,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="misfirePolicy"  column="misfire_policy"  />
 		<result property="concurrent"     column="concurrent"      />
 		<result property="status"         column="status"          />
-		<result property="createBy"       column="create_by"       />
+		<result property="createUser"       column="create_by"       />
 		<result property="createTime"     column="create_time"     />
-		<result property="updateBy"       column="update_by"       />
+		<result property="updateUser"       column="update_by"       />
 		<result property="updateTime"     column="update_time"     />
 		<result property="remark"         column="remark"          />
 	</resultMap>
@@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="concurrent != null and concurrent != ''">concurrent = #{concurrent},</if>
  			<if test="status !=null">status = #{status},</if>
  			<if test="remark != null and remark != ''">remark = #{remark},</if>
- 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+ 			<if test="updateUser != null and updateUser != ''">update_by = #{updateUser},</if>
  			update_time = sysdate()
  		</set>
  		where job_id = #{jobId}
@@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="concurrent != null and concurrent != ''">concurrent,</if>
  			<if test="status != null and status != ''">status,</if>
  			<if test="remark != null and remark != ''">remark,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
+ 			<if test="createUser != null and createUser != ''">create_by,</if>
  			create_time
  		)values(
  			<if test="jobId != null and jobId != 0">#{jobId},</if>
@@ -103,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="concurrent != null and concurrent != ''">#{concurrent},</if>
  			<if test="status != null and status != ''">#{status},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+ 			<if test="createUser != null and createUser != ''">#{createUser},</if>
  			sysdate()
  		)
 	</insert>

08.src/Xingxi/xingxi-quartz/target/classes/templates/monitor/job/add.html

@@ -6,7 +6,7 @@
 <body class="white-bg">
 	<div class="wrapper wrapper-content animated fadeInRight ibox-content">
 		<form class="form-horizontal m" id="form-job-add">
-		    <input type="hidden" name="createBy" th:value="${@permission.getPrincipalProperty('loginName')}">
+		    <input type="hidden" name="createUser" th:value="${@permission.getPrincipalProperty('loginName')}">
 			<div class="form-group">
 				<label class="col-sm-3 control-label is-required">任务名称：</label>
 				<div class="col-sm-8">

08.src/Xingxi/xingxi-quartz/target/classes/templates/monitor/job/edit.html

@@ -7,7 +7,7 @@
 	<div class="wrapper wrapper-content animated fadeInRight ibox-content">
 		<form class="form-horizontal m" id="form-job-edit" th:object="${job}">
 			<input id="jobId" name="jobId" type="hidden" th:field="*{jobId}"/>
-			<input type="hidden" name="updateBy" th:value="${@permission.getPrincipalProperty('loginName')}">
+			<input type="hidden" name="updateUser" th:value="${@permission.getPrincipalProperty('loginName')}">
 			<div class="form-group">
 				<label class="col-sm-3 control-label is-required">任务名称：</label>
 				<div class="col-sm-8">

08.src/Xingxi/xingxi-system/target/classes/mapper/system/SysConfigMapper.xml

@@ -10,9 +10,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="configKey"     column="config_key"     />
         <result property="configValue"   column="config_value"   />
         <result property="configType"    column="config_type"    />
-        <result property="createBy"      column="create_by"      />
+        <result property="createUser"      column="create_by"      />
         <result property="createTime"    column="create_time"    />
-        <result property="updateBy"      column="update_by"      />
+        <result property="updateUser"      column="update_by"      />
         <result property="updateTime"    column="update_time"    />
     </resultMap>
     
@@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="configKey != null and configKey != '' ">config_key,</if>
 			<if test="configValue != null and configValue != '' ">config_value,</if>
 			<if test="configType != null and configType != '' ">config_type,</if>
-			<if test="createBy != null and createBy != ''">create_by,</if>
+			<if test="createUser != null and createUser != ''">create_by,</if>
 			<if test="remark != null and remark != ''">remark,</if>
  			create_time
         )values(
@@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="configKey != null and configKey != ''">#{configKey},</if>
 			<if test="configValue != null and configValue != ''">#{configValue},</if>
 			<if test="configType != null and configType != ''">#{configType},</if>
-			<if test="createBy != null and createBy != ''">#{createBy},</if>
+			<if test="createUser != null and createUser != ''">#{createUser},</if>
 			<if test="remark != null and remark != ''">#{remark},</if>
  			sysdate()
 		)
@@ -96,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="configKey != null and configKey != ''">config_key = #{configKey},</if>
             <if test="configValue != null and configValue != ''">config_value = #{configValue},</if>
             <if test="configType != null and configType != ''">config_type = #{configType},</if>
-            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="updateUser != null and updateUser != ''">update_by = #{updateUser},</if>
             <if test="remark != null">remark = #{remark},</if>
  			update_time = sysdate()
         </set>

08.src/Xingxi/xingxi-system/target/classes/mapper/system/SysDeptMapper.xml

@@ -16,9 +16,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="status"     column="status"      />
 		<result property="delFlag"    column="del_flag"    />
 		<result property="parentName" column="parent_name" />
-		<result property="createBy"   column="create_by"   />
+		<result property="createUser"   column="create_by"   />
 		<result property="createTime" column="create_time" />
-		<result property="updateBy"   column="update_by"   />
+		<result property="updateUser"   column="update_by"   />
 		<result property="updateTime" column="update_time" />
 	</resultMap>
 	
@@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="phone != null and phone != ''">phone,</if>
  			<if test="email != null and email != ''">email,</if>
  			<if test="status != null">status,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
+ 			<if test="createUser != null and createUser != ''">create_by,</if>
  			create_time
  		)values(
  			<if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -109,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="phone != null and phone != ''">#{phone},</if>
  			<if test="email != null and email != ''">#{email},</if>
  			<if test="status != null">#{status},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+ 			<if test="createUser != null and createUser != ''">#{createUser},</if>
  			sysdate()
  		)
 	</insert>
@@ -125,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="phone != null">phone = #{phone},</if>
  			<if test="email != null">email = #{email},</if>
  			<if test="status != null and status != ''">status = #{status},</if>
- 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+ 			<if test="updateUser != null and updateUser != ''">update_by = #{updateUser},</if>
  			update_time = sysdate()
  		</set>
  		where dept_id = #{deptId}

08.src/Xingxi/xingxi-system/target/classes/mapper/system/SysDictDataMapper.xml

@@ -14,9 +14,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="listClass"  column="list_class"  />
 		<result property="isDefault"  column="is_default"  />
 		<result property="status"     column="status"      />
-		<result property="createBy"   column="create_by"   />
+		<result property="createUser"   column="create_by"   />
 		<result property="createTime" column="create_time" />
-		<result property="updateBy"   column="update_by"   />
+		<result property="updateUser"   column="update_by"   />
 		<result property="updateTime" column="update_time" />
 	</resultMap>
 	
@@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="isDefault != null and isDefault != ''">is_default = #{isDefault},</if>
  			<if test="status != null">status = #{status},</if>
  			<if test="remark != null">remark = #{remark},</if>
- 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+ 			<if test="updateUser != null and updateUser != ''">update_by = #{updateUser},</if>
  			update_time = sysdate()
  		</set>
  		where dict_code = #{dictCode}
@@ -103,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="isDefault != null and isDefault != ''">is_default,</if>
  			<if test="status != null">status,</if>
  			<if test="remark != null and remark != ''">remark,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
+ 			<if test="createUser != null and createUser != ''">create_by,</if>
  			create_time
  		)values(
  		    <if test="dictSort != null">#{dictSort},</if>
@@ -115,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="isDefault != null and isDefault != ''">#{isDefault},</if>
  			<if test="status != null">#{status},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+ 			<if test="createUser != null and createUser != ''">#{createUser},</if>
  			sysdate()
  		)
 	</insert>

08.src/Xingxi/xingxi-system/target/classes/mapper/system/SysDictTypeMapper.xml

@@ -9,9 +9,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="dictName"   column="dict_name"   />
 		<result property="dictType"   column="dict_type"   />
 		<result property="status"     column="status"      />
-		<result property="createBy"   column="create_by"   />
+		<result property="createUser"   column="create_by"   />
 		<result property="createTime" column="create_time" />
-		<result property="updateBy"   column="update_by"   />
+		<result property="updateUser"   column="update_by"   />
 		<result property="updateTime" column="update_time" />
 	</resultMap>
 	
@@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
  			<if test="status != null">status = #{status},</if>
  			<if test="remark != null">remark = #{remark},</if>
- 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+ 			<if test="updateUser != null and updateUser != ''">update_by = #{updateUser},</if>
  			update_time = sysdate()
  		</set>
  		where dict_id = #{dictId}
@@ -90,14 +90,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="dictType != null and dictType != ''">dict_type,</if>
  			<if test="status != null">status,</if>
  			<if test="remark != null and remark != ''">remark,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
+ 			<if test="createUser != null and createUser != ''">create_by,</if>
  			create_time
  		)values(
  			<if test="dictName != null and dictName != ''">#{dictName},</if>
  			<if test="dictType != null and dictType != ''">#{dictType},</if>
  			<if test="status != null">#{status},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+ 			<if test="createUser != null and createUser != ''">#{createUser},</if>
  			sysdate()
  		)
 	</insert>

08.src/Xingxi/xingxi-system/target/classes/mapper/system/SysMenuMapper.xml

@@ -17,10 +17,10 @@
 		<result property="isRefresh"      column="is_refresh"     />
 		<result property="perms"          column="perms"          />
 		<result property="icon"           column="icon"           />
-		<result property="createBy"       column="create_by"      />
+		<result property="createUser"       column="create_by"      />
 		<result property="createTime"     column="create_time"    />
 		<result property="updateTime"     column="update_time"    />
-		<result property="updateBy"       column="update_by"      />
+		<result property="updateUser"       column="update_by"      />
 		<result property="remark"         column="remark"         />
 	</resultMap>
 
@@ -148,7 +148,7 @@
 			<if test="perms !=null">perms = #{perms},</if>
 			<if test="icon !=null and icon != ''">icon = #{icon},</if>
 			<if test="remark != null">remark = #{remark},</if>
-			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+			<if test="updateUser != null and updateUser != ''">update_by = #{updateUser},</if>
 			update_time = sysdate()
 		</set>
 		where menu_id = #{menuId}
@@ -168,7 +168,7 @@
 		<if test="perms !=null and perms != ''">perms,</if>
 		<if test="icon != null and icon != ''">icon,</if>
 		<if test="remark != null and remark != ''">remark,</if>
-		<if test="createBy != null and createBy != ''">create_by,</if>
+		<if test="createUser != null and createUser != ''">create_by,</if>
 		create_time
 		)values(
 		<if test="menuId != null and menuId != 0">#{menuId},</if>
@@ -183,7 +183,7 @@
 		<if test="perms !=null and perms != ''">#{perms},</if>
 		<if test="icon != null and icon != ''">#{icon},</if>
 		<if test="remark != null and remark != ''">#{remark},</if>
-		<if test="createBy != null and createBy != ''">#{createBy},</if>
+		<if test="createUser != null and createUser != ''">#{createUser},</if>
 		sysdate()
 		)
 	</insert>

08.src/Xingxi/xingxi-system/target/classes/mapper/system/SysNoticeMapper.xml

@@ -10,9 +10,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="noticeType"     column="notice_type"     />
         <result property="noticeContent"  column="notice_content"  />
         <result property="status"         column="status"          />
-        <result property="createBy"       column="create_by"       />
+        <result property="createUser"       column="create_by"       />
         <result property="createTime"     column="create_time"     />
-        <result property="updateBy"       column="update_by"       />
+        <result property="updateUser"       column="update_by"       />
         <result property="updateTime"     column="update_time"     />
         <result property="remark"         column="remark"          />
     </resultMap>
@@ -36,8 +36,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="noticeType != null and noticeType != ''">
 				AND notice_type = #{noticeType}
 			</if>
-			<if test="createBy != null and createBy != ''">
-				AND create_by like concat('%', #{createBy}, '%')
+			<if test="createUser != null and createUser != ''">
+				AND create_by like concat('%', #{createUser}, '%')
 			</if>
 		</where>
     </select>
@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="noticeContent != null and noticeContent != '' ">notice_content, </if>
 			<if test="status != null and status != '' ">status, </if>
 			<if test="remark != null and remark != ''">remark,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
+ 			<if test="createUser != null and createUser != ''">create_by,</if>
  			create_time
  		)values(
 			<if test="noticeTitle != null and noticeTitle != ''">#{noticeTitle}, </if>
@@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="noticeContent != null and noticeContent != ''">#{noticeContent}, </if>
 			<if test="status != null and status != ''">#{status}, </if>
 			<if test="remark != null and remark != ''">#{remark},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+ 			<if test="createUser != null and createUser != ''">#{createUser},</if>
  			sysdate()
 		)
     </insert>
@@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="noticeType != null and noticeType != ''">notice_type = #{noticeType}, </if>
             <if test="noticeContent != null">notice_content = #{noticeContent}, </if>
             <if test="status != null and status != ''">status = #{status}, </if>
-            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="updateUser != null and updateUser != ''">update_by = #{updateUser},</if>
  			update_time = sysdate()
         </set>
         where notice_id = #{noticeId}

08.src/Xingxi/xingxi-system/target/classes/mapper/system/SysPostMapper.xml

@@ -10,9 +10,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="postName"      column="post_name"     />
 		<result property="postSort"      column="post_sort"     />
 		<result property="status"        column="status"        />
-		<result property="createBy"      column="create_by"     />
+		<result property="createUser"      column="create_by"     />
 		<result property="createTime"    column="create_time"   />
-		<result property="updateBy"      column="update_by"     />
+		<result property="updateUser"      column="update_by"     />
 		<result property="updateTime"    column="update_time"   />
 		<result property="remark"        column="remark"        />
 	</resultMap>
@@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="postSort != null and postSort != ''">post_sort = #{postSort},</if>
  			<if test="status != null and status != ''">status = #{status},</if>
  			<if test="remark != null">remark = #{remark},</if>
- 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+ 			<if test="updateUser != null and updateUser != ''">update_by = #{updateUser},</if>
  			update_time = sysdate()
  		</set>
  		where post_id = #{postId}
@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="postSort != null and postSort != ''">post_sort,</if>
  			<if test="status != null and status != ''">status,</if>
  			<if test="remark != null and remark != ''">remark,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
+ 			<if test="createUser != null and createUser != ''">create_by,</if>
  			create_time
  		)values(
  			<if test="postId != null and postId != 0">#{postId},</if>
@@ -102,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="postSort != null and postSort != ''">#{postSort},</if>
  			<if test="status != null and status != ''">#{status},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+ 			<if test="createUser != null and createUser != ''">#{createUser},</if>
  			sysdate()
  		)
 	</insert>

08.src/Xingxi/xingxi-system/target/classes/mapper/system/SysRoleMapper.xml

@@ -12,9 +12,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="dataScope"    column="data_scope"     />
 		<result property="status"       column="status"         />
 		<result property="delFlag"      column="del_flag"       />
-		<result property="createBy"     column="create_by"      />
+		<result property="createUser"     column="create_by"      />
 		<result property="createTime"   column="create_time"    />
-		<result property="updateBy"     column="update_by"      />
+		<result property="updateUser"     column="update_by"      />
 		<result property="updateTime"   column="update_time"    />
 		<result property="remark"       column="remark"         />
 	</resultMap>
@@ -101,7 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="dataScope != null and dataScope != ''">data_scope = #{dataScope},</if>
  			<if test="status != null and status != ''">status = #{status},</if>
  			<if test="remark != null">remark = #{remark},</if>
- 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+ 			<if test="updateUser != null and updateUser != ''">update_by = #{updateUser},</if>
  			update_time = sysdate()
  		</set>
  		where role_id = #{roleId}
@@ -116,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="dataScope != null and dataScope != ''">data_scope,</if>
  			<if test="status != null and status != ''">status,</if>
  			<if test="remark != null and remark != ''">remark,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
+ 			<if test="createUser != null and createUser != ''">create_by,</if>
  			create_time
  		)values(
  			<if test="roleId != null and roleId != 0">#{roleId},</if>
@@ -126,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="dataScope != null and dataScope != ''">#{dataScope},</if>
  			<if test="status != null and status != ''">#{status},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+ 			<if test="createUser != null and createUser != ''">#{createUser},</if>
  			sysdate()
  		)
 	</insert>

08.src/Xingxi/xingxi-system/target/classes/mapper/system/SysUserMapper.xml

@@ -21,9 +21,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="loginIp"       column="login_ip"        />
 		<result property="loginDate"     column="login_date"      />
 		<result property="pwdUpdateDate" column="pwd_update_date" />
-		<result property="createBy"      column="create_by"       />
+		<result property="createUser"      column="create_by"       />
 		<result property="createTime"    column="create_time"     />
-		<result property="updateBy"      column="update_by"       />
+		<result property="updateUser"      column="update_by"       />
 		<result property="updateTime"    column="update_time"     />
 		<result property="remark"        column="remark"          />
 		<association property="dept"     javaType="SysDept"         resultMap="deptResult" />
@@ -183,7 +183,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
  			<if test="loginDate != null">login_date = #{loginDate},</if>
  			<if test="pwdUpdateDate != null">pwd_update_date = #{pwdUpdateDate},</if>
- 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+ 			<if test="updateUser != null and updateUser != ''">update_by = #{updateUser},</if>
  			<if test="remark != null">remark = #{remark},</if>
  			update_time = sysdate()
  		</set>
@@ -205,7 +205,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="salt != null and salt != ''">salt,</if>
  			<if test="status != null and status != ''">status,</if>
  			<if test="pwdUpdateDate != null">pwd_update_date,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
+ 			<if test="createUser != null and createUser != ''">create_by,</if>
  			<if test="remark != null and remark != ''">remark,</if>
  			create_time
  		)values(
@@ -222,7 +222,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="salt != null and salt != ''">#{salt},</if>
  			<if test="status != null and status != ''">#{status},</if>
  			<if test="pwdUpdateDate != null">#{pwdUpdateDate},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+ 			<if test="createUser != null and createUser != ''">#{createUser},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
  			sysdate()
  		)