fix

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/UserLoginLogDTO.java

@@ -24,7 +24,7 @@ public class UserLoginLogDTO implements Serializable {
 
     private Integer status;
 
-    private String wxUserId;
+    private String staffId;
 
     private Date createTime;
 
@@ -112,12 +112,13 @@ public class UserLoginLogDTO implements Serializable {
         this.status = status;
     }
 
-    public String getWxUserId() {
-        return wxUserId;
+
+    public String getStaffId() {
+		return staffId;
 	}
 
-    public void setWxUserId(String wxUserId) {
-        this.wxUserId = wxUserId == null ? null : wxUserId.trim();
+	public void setStaffId(String staffId) {
+		this.staffId = staffId;
 	}
 
 	public Date getCreateTime() {

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabUserLoginLog.java

@@ -24,7 +24,7 @@ public class TabUserLoginLog implements Serializable {
 
     private Integer status;
 
-    private String wxUserId;
+    private String staffId;
 
     private Date createTime;
 
@@ -112,12 +112,13 @@ public class TabUserLoginLog implements Serializable {
         this.status = status;
     }
 
-    public String getWxUserId() {
-        return wxUserId;
+
+    public String getStaffId() {
+		return staffId;
 	}
 
-    public void setWxUserId(String wxUserId) {
-        this.wxUserId = wxUserId == null ? null : wxUserId.trim();
+	public void setStaffId(String staffId) {
+		this.staffId = staffId;
 	}
 
 	public Date getCreateTime() {

haoban-manage3-service/src/main/resources/mapper/TabUserLoginLogMapper.xml

@@ -12,13 +12,13 @@
     <result column="platform" property="platform" jdbcType="VARCHAR" />
     <result column="system_info" property="systemInfo" jdbcType="VARCHAR" />
     <result column="status" property="status" jdbcType="INTEGER" />
-    <result column="wx_user_id" property="wxUserId" jdbcType="VARCHAR" />
+    <result column="staff_id" property="staffId" jdbcType="VARCHAR" />
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
     <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
     user_login_log, wx_enterprise_id, version, SDK_version, system, brand, model, platform, 
-    system_info, status, wx_user_id, create_time, update_time
+    system_info, status, staff_id, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -34,12 +34,12 @@
     insert into tab_haoban_user_login_log (user_login_log, wx_enterprise_id, version, 
       SDK_version, system, brand, 
       model, platform, system_info, 
-      status, wx_user_id, create_time, 
+      status, staff_id, create_time, 
       update_time)
     values (#{userLoginLog,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR}, #{version,jdbcType=VARCHAR}, 
       #{sdkVersion,jdbcType=VARCHAR}, #{system,jdbcType=VARCHAR}, #{brand,jdbcType=VARCHAR}, 
       #{model,jdbcType=VARCHAR}, #{platform,jdbcType=VARCHAR}, #{systemInfo,jdbcType=VARCHAR}, 
-      #{status,jdbcType=INTEGER}, #{wxUserId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{status,jdbcType=INTEGER}, #{staffId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabUserLoginLog" >
@@ -75,8 +75,8 @@
       <if test="status != null" >
         status,
       </if>
-      <if test="wxUserId != null" >
-        wx_user_id,
+      <if test="staffId != null" >
+        staff_id,
       </if>
       <if test="createTime != null" >
         create_time,
@@ -116,8 +116,8 @@
       <if test="status != null" >
         #{status,jdbcType=INTEGER},
       </if>
-      <if test="wxUserId != null" >
-        #{wxUserId,jdbcType=VARCHAR},
+      <if test="staffId != null" >
+        #{staffId,jdbcType=VARCHAR},
       </if>
       <if test="createTime != null" >
         #{createTime,jdbcType=TIMESTAMP},
@@ -157,8 +157,8 @@
       <if test="status != null" >
         status = #{status,jdbcType=INTEGER},
       </if>
-      <if test="wxUserId != null" >
-        wx_user_id = #{wxUserId,jdbcType=VARCHAR},
+      <if test="staffId != null" >
+        staff_id = #{staffId,jdbcType=VARCHAR},
       </if>
       <if test="createTime != null" >
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -180,7 +180,7 @@
       platform = #{platform,jdbcType=VARCHAR},
       system_info = #{systemInfo,jdbcType=VARCHAR},
       status = #{status,jdbcType=INTEGER},
-      wx_user_id = #{wxUserId,jdbcType=VARCHAR},
+      staff_id = #{staffId,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where user_login_log = #{userLoginLog,jdbcType=VARCHAR}