Browse Source

删除status

bihuisong 5 months ago
parent
commit
8219043442

+ 7 - 155
qmjszx-system/src/main/java/beilv/system/domain/SysMember.java

@@ -23,6 +23,13 @@ public class SysMember extends BaseEntity {
      */
     private Long id;
 
+
+    /**
+     * 小程序openid
+     */
+    @Excel(name = "小程序openid")
+    private String openId;
+
     /**
      * 用户账户(跟accout一样)
      */
@@ -42,31 +49,6 @@ public class SysMember extends BaseEntity {
     private String realName;
 
     /**
-     * 性别
-     */
-    @Excel(name = "性别")
-    private Integer sex;
-
-    /**
-     * 生日
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @Excel(name = "生日", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date birthday;
-
-    /**
-     * 身份证号码
-     */
-    @Excel(name = "身份证号码")
-    private String cardId;
-
-    /**
-     * 用户头像
-     */
-    @Excel(name = "用户头像")
-    private String avatar;
-
-    /**
      * 手机号码
      */
     @Excel(name = "手机号码")
@@ -91,42 +73,12 @@ public class SysMember extends BaseEntity {
     private String registerIp;
 
     /**
-     * 添加ip
-     */
-    @Excel(name = "添加ip")
-    private String addIp;
-
-    /**
-     * 最后一次登录ip
-     */
-    @Excel(name = "最后一次登录ip")
-    private String lastIp;
-
-    /**
      * 用户剩余积分
      */
     @Excel(name = "用户剩余积分")
     private BigDecimal integral;
 
     /**
-     * 0为正常,1为禁止
-     */
-    @Excel(name = "0为正常,1为禁止")
-    private Integer status;
-
-    /**
-     * 用户类型
-     */
-    @Excel(name = "用户类型")
-    private String userType;
-
-    /**
-     * 用户登陆类型,h5,wechat,routine
-     */
-    @Excel(name = "用户登陆类型,h5,wechat,routine")
-    private String loginType;
-
-    /**
      * 微信用户json信息
      */
     @Excel(name = "微信用户json信息")
@@ -137,17 +89,7 @@ public class SysMember extends BaseEntity {
      */
     private Integer delFlag;
 
-    /**
-     * 公众号openid
-     */
-    @Excel(name = "公众号openid")
-    private String openId;
 
-    /**
-     * 小程序openid
-     */
-    @Excel(name = "小程序openid")
-    private String routineOpenId;
 
     public void setId(Long id) {
         this.id = id;
@@ -181,38 +123,6 @@ public class SysMember extends BaseEntity {
         return realName;
     }
 
-    public void setSex(Integer sex) {
-        this.sex = sex;
-    }
-
-    public Integer getSex() {
-        return sex;
-    }
-
-    public void setBirthday(Date birthday) {
-        this.birthday = birthday;
-    }
-
-    public Date getBirthday() {
-        return birthday;
-    }
-
-    public void setCardId(String cardId) {
-        this.cardId = cardId;
-    }
-
-    public String getCardId() {
-        return cardId;
-    }
-
-    public void setAvatar(String avatar) {
-        this.avatar = avatar;
-    }
-
-    public String getAvatar() {
-        return avatar;
-    }
-
     public void setMobile(String mobile) {
         this.mobile = mobile;
     }
@@ -245,22 +155,6 @@ public class SysMember extends BaseEntity {
         return registerIp;
     }
 
-    public void setAddIp(String addIp) {
-        this.addIp = addIp;
-    }
-
-    public String getAddIp() {
-        return addIp;
-    }
-
-    public void setLastIp(String lastIp) {
-        this.lastIp = lastIp;
-    }
-
-    public String getLastIp() {
-        return lastIp;
-    }
-
     public void setIntegral(BigDecimal integral) {
         this.integral = integral;
     }
@@ -269,30 +163,6 @@ public class SysMember extends BaseEntity {
         return integral;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setUserType(String userType) {
-        this.userType = userType;
-    }
-
-    public String getUserType() {
-        return userType;
-    }
-
-    public void setLoginType(String loginType) {
-        this.loginType = loginType;
-    }
-
-    public String getLoginType() {
-        return loginType;
-    }
-
     public void setWxProfile(String wxProfile) {
         this.wxProfile = wxProfile;
     }
@@ -317,14 +187,6 @@ public class SysMember extends BaseEntity {
         return openId;
     }
 
-    public void setRoutineOpenId(String routineOpenId) {
-        this.routineOpenId = routineOpenId;
-    }
-
-    public String getRoutineOpenId() {
-        return routineOpenId;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -332,28 +194,18 @@ public class SysMember extends BaseEntity {
                 .append("username", getUsername())
                 .append("password", getPassword())
                 .append("realName", getRealName())
-                .append("sex", getSex())
-                .append("birthday", getBirthday())
-                .append("cardId", getCardId())
-                .append("avatar", getAvatar())
                 .append("mobile", getMobile())
                 .append("loginDate", getLoginDate())
                 .append("loginIp", getLoginIp())
                 .append("registerIp", getRegisterIp())
-                .append("addIp", getAddIp())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())
                 .append("updateBy", getUpdateBy())
                 .append("updateTime", getUpdateTime())
-                .append("lastIp", getLastIp())
                 .append("integral", getIntegral())
-                .append("status", getStatus())
-                .append("userType", getUserType())
-                .append("loginType", getLoginType())
                 .append("wxProfile", getWxProfile())
                 .append("delFlag", getDelFlag())
                 .append("openId", getOpenId())
-                .append("routineOpenId", getRoutineOpenId())
                 .toString();
     }
 }

+ 1 - 6
qmjszx-system/src/main/resources/mapper/system/SysMemberMapper.xml

@@ -18,14 +18,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="integral"    column="integral"    />
-        <result property="status"    column="status"    />
         <result property="wxProfile"    column="wx_profile"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="openId"    column="open_id"    />
     </resultMap>
 
     <sql id="selectSysMemberVo">
-        select id, username, password, real_name, mobile, login_date, login_ip, register_ip, create_by, create_time, update_by, update_time, integral, status, wx_profile, del_flag, open_id from sys_member
+        select id, username, password, real_name, mobile, login_date, login_ip, register_ip, create_by, create_time, update_by, update_time, integral, wx_profile, del_flag, open_id from sys_member
     </sql>
 
     <select id="selectSysMemberList" parameterType="SysMember" resultMap="SysMemberResult">
@@ -39,7 +38,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="loginIp != null  and loginIp != ''"> and login_ip = #{loginIp}</if>
             <if test="registerIp != null  and registerIp != ''"> and register_ip = #{registerIp}</if>
             <if test="integral != null "> and integral = #{integral}</if>
-            <if test="status != null "> and status = #{status}</if>
             <if test="wxProfile != null  and wxProfile != ''"> and wx_profile = #{wxProfile}</if>
             <if test="openId != null  and openId != ''"> and open_id = #{openId}</if>
         </where>
@@ -65,7 +63,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="integral != null">integral,</if>
-            <if test="status != null">status,</if>
             <if test="wxProfile != null">wx_profile,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="openId != null">open_id,</if>
@@ -83,7 +80,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="integral != null">#{integral},</if>
-            <if test="status != null">#{status},</if>
             <if test="wxProfile != null">#{wxProfile},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="openId != null">#{openId},</if>
@@ -105,7 +101,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="integral != null">integral = #{integral},</if>
-            <if test="status != null">status = #{status},</if>
             <if test="wxProfile != null">wx_profile = #{wxProfile},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="openId != null">open_id = #{openId},</if>