Merge branch 'cachealert1016' into uat

suishenbang-system/src/main/resources/mapper/system/SysMagnetLogMapper.xml

@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectSysMagnetLogList" parameterType="SysMagnetLog" resultMap="SysMagnetLogResult">
-        select a.id, a.user_id, a.user_name,a.login_name,a.sap_employee_id, b.org_code, b.org_name, b.sales_level level, a.magnet_name, a.create_by, a.create_time, a.update_by, a.update_time
+        select a.id, a.user_id, a.user_name,a.login_name,a.sap_employee_id, b.org_code, b.org_name, b.sales_level level, a.magnet_name, a.create_time
         from sys_magnet_log a left join sys_user_ext b on a.user_id=b.user_id
         <where>
             <if test="userId != null "> and a.user_id = #{userId}</if>