hurui
/
puhui-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
master
袁野 5 months ago
parent b133fd7af4
commit 395ff78240
4 changed files with 0 additions and 60 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 23
      service/src/main/java/com/hfkj/dao/BsUserMapper.java
  2. 15
      service/src/main/java/com/hfkj/dao/BsUserSqlProvider.java
  3. 19
      service/src/main/java/com/hfkj/entity/BsUser.java
  4. 3
      service/src/main/java/com/hfkj/entity/BsUserExample.java

23
service/src/main/java/com/hfkj/dao/BsUserMapper.java
Unescape View File

@ -43,26 +43,16 @@ public interface BsUserMapper extends BsUserMapperExt {
"phone, `password`, ",
"integral, `status`, ",
"wx_mp_openid, wx_ma_openid, ",
<<<<<<< HEAD
"v_family_openid, create_time, ",
"update_time, ext_1, ",
"ext_2, ext_3)",
=======
"create_time, update_time, ",
"ext_1, ext_2, ext_3)",
>>>>>>> 66a3a513346e2d2bf80c7ca2d9fe9309158d90d4
"values (#{headImg,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, ",
"#{phone,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, ",
"#{integral,jdbcType=BIGINT}, #{status,jdbcType=INTEGER}, ",
"#{wxMpOpenid,jdbcType=VARCHAR}, #{wxMaOpenid,jdbcType=VARCHAR}, ",
<<<<<<< HEAD
"#{vFamilyOpenid,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, ",
"#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ",
"#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
=======
"#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ",
"#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
>>>>>>> 66a3a513346e2d2bf80c7ca2d9fe9309158d90d4
})
@Options(useGeneratedKeys=true,keyProperty="id")
int insert(BsUser record);
@ -82,10 +72,7 @@ public interface BsUserMapper extends BsUserMapperExt {
@Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@Result(column="wx_mp_openid", property="wxMpOpenid", jdbcType=JdbcType.VARCHAR),
@Result(column="wx_ma_openid", property="wxMaOpenid", jdbcType=JdbcType.VARCHAR),
<<<<<<< HEAD
@Result(column="v_family_openid", property="vFamilyOpenid", jdbcType=JdbcType.VARCHAR),
=======
>>>>>>> 66a3a513346e2d2bf80c7ca2d9fe9309158d90d4
@Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@ -97,11 +84,7 @@ public interface BsUserMapper extends BsUserMapperExt {
@Select({
"select",
"id, head_img, `name`, phone, `password`, integral, `status`, wx_mp_openid, wx_ma_openid, ",
<<<<<<< HEAD
"v_family_openid, create_time, update_time, ext_1, ext_2, ext_3",
=======
"create_time, update_time, ext_1, ext_2, ext_3",
>>>>>>> 66a3a513346e2d2bf80c7ca2d9fe9309158d90d4
"from bs_user",
"where id = #{id,jdbcType=BIGINT}"
})
@ -115,10 +98,7 @@ public interface BsUserMapper extends BsUserMapperExt {
@Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@Result(column="wx_mp_openid", property="wxMpOpenid", jdbcType=JdbcType.VARCHAR),
@Result(column="wx_ma_openid", property="wxMaOpenid", jdbcType=JdbcType.VARCHAR),
<<<<<<< HEAD
@Result(column="v_family_openid", property="vFamilyOpenid", jdbcType=JdbcType.VARCHAR),
=======
>>>>>>> 66a3a513346e2d2bf80c7ca2d9fe9309158d90d4
@Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@ -146,10 +126,7 @@ public interface BsUserMapper extends BsUserMapperExt {
"`status` = #{status,jdbcType=INTEGER},",
"wx_mp_openid = #{wxMpOpenid,jdbcType=VARCHAR},",
"wx_ma_openid = #{wxMaOpenid,jdbcType=VARCHAR},",
<<<<<<< HEAD
"v_family_openid = #{vFamilyOpenid,jdbcType=VARCHAR},",
=======
>>>>>>> 66a3a513346e2d2bf80c7ca2d9fe9309158d90d4
"create_time = #{createTime,jdbcType=TIMESTAMP},",
"update_time = #{updateTime,jdbcType=TIMESTAMP},",
"ext_1 = #{ext1,jdbcType=VARCHAR},",

15
service/src/main/java/com/hfkj/dao/BsUserSqlProvider.java
Unescape View File

@ -60,13 +60,10 @@ public class BsUserSqlProvider {
sql.VALUES("wx_ma_openid", "#{wxMaOpenid,jdbcType=VARCHAR}");
}
<<<<<<< HEAD
if (record.getvFamilyOpenid() != null) {
sql.VALUES("v_family_openid", "#{vFamilyOpenid,jdbcType=VARCHAR}");
}
=======
>>>>>>> 66a3a513346e2d2bf80c7ca2d9fe9309158d90d4
if (record.getCreateTime() != null) {
sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}");
}
@ -105,10 +102,7 @@ public class BsUserSqlProvider {
sql.SELECT("`status`");
sql.SELECT("wx_mp_openid");
sql.SELECT("wx_ma_openid");
<<<<<<< HEAD
sql.SELECT("v_family_openid");
=======
>>>>>>> 66a3a513346e2d2bf80c7ca2d9fe9309158d90d4
sql.SELECT("create_time");
sql.SELECT("update_time");
sql.SELECT("ext_1");
@ -167,13 +161,10 @@ public class BsUserSqlProvider {
sql.SET("wx_ma_openid = #{record.wxMaOpenid,jdbcType=VARCHAR}");
}
<<<<<<< HEAD
if (record.getvFamilyOpenid() != null) {
sql.SET("v_family_openid = #{record.vFamilyOpenid,jdbcType=VARCHAR}");
}
=======
>>>>>>> 66a3a513346e2d2bf80c7ca2d9fe9309158d90d4
if (record.getCreateTime() != null) {
sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
}
@ -211,10 +202,7 @@ public class BsUserSqlProvider {
sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
sql.SET("wx_mp_openid = #{record.wxMpOpenid,jdbcType=VARCHAR}");
sql.SET("wx_ma_openid = #{record.wxMaOpenid,jdbcType=VARCHAR}");
<<<<<<< HEAD
sql.SET("v_family_openid = #{record.vFamilyOpenid,jdbcType=VARCHAR}");
=======
>>>>>>> 66a3a513346e2d2bf80c7ca2d9fe9309158d90d4
sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
@ -262,13 +250,10 @@ public class BsUserSqlProvider {
sql.SET("wx_ma_openid = #{wxMaOpenid,jdbcType=VARCHAR}");
}
<<<<<<< HEAD
if (record.getvFamilyOpenid() != null) {
sql.SET("v_family_openid = #{vFamilyOpenid,jdbcType=VARCHAR}");
}
=======
>>>>>>> 66a3a513346e2d2bf80c7ca2d9fe9309158d90d4
if (record.getCreateTime() != null) {
sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}");
}

19
service/src/main/java/com/hfkj/entity/BsUser.java
Unescape View File

@ -54,23 +54,16 @@ public class BsUser implements Serializable {
private String wxMpOpenid;
/**
<<<<<<< HEAD
* 微信小程序openid
=======
* 微信小重新openid
>>>>>>> 66a3a513346e2d2bf80c7ca2d9fe9309158d90d4
*/
private String wxMaOpenid;
/**
<<<<<<< HEAD
* v家园openid
*/
private String vFamilyOpenid;
/**
=======
>>>>>>> 66a3a513346e2d2bf80c7ca2d9fe9309158d90d4
* 创建时间
*/
private Date createTime;
@ -160,7 +153,6 @@ public class BsUser implements Serializable {
this.wxMaOpenid = wxMaOpenid;
}
<<<<<<< HEAD
public String getvFamilyOpenid() {
return vFamilyOpenid;
}
@ -169,8 +161,6 @@ public class BsUser implements Serializable {
this.vFamilyOpenid = vFamilyOpenid;
}
=======
>>>>>>> 66a3a513346e2d2bf80c7ca2d9fe9309158d90d4
public Date getCreateTime() {
return createTime;
}
@ -232,10 +222,7 @@ public class BsUser implements Serializable {
&& (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
&& (this.getWxMpOpenid() == null ? other.getWxMpOpenid() == null : this.getWxMpOpenid().equals(other.getWxMpOpenid()))
&& (this.getWxMaOpenid() == null ? other.getWxMaOpenid() == null : this.getWxMaOpenid().equals(other.getWxMaOpenid()))
<<<<<<< HEAD
&& (this.getvFamilyOpenid() == null ? other.getvFamilyOpenid() == null : this.getvFamilyOpenid().equals(other.getvFamilyOpenid()))
=======
>>>>>>> 66a3a513346e2d2bf80c7ca2d9fe9309158d90d4
&& (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
&& (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
&& (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1()))
@ -256,10 +243,7 @@ public class BsUser implements Serializable {
result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
result = prime * result + ((getWxMpOpenid() == null) ? 0 : getWxMpOpenid().hashCode());
result = prime * result + ((getWxMaOpenid() == null) ? 0 : getWxMaOpenid().hashCode());
<<<<<<< HEAD
result = prime * result + ((getvFamilyOpenid() == null) ? 0 : getvFamilyOpenid().hashCode());
=======
>>>>>>> 66a3a513346e2d2bf80c7ca2d9fe9309158d90d4
result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
@ -283,10 +267,7 @@ public class BsUser implements Serializable {
sb.append(", status=").append(status);
sb.append(", wxMpOpenid=").append(wxMpOpenid);
sb.append(", wxMaOpenid=").append(wxMaOpenid);
<<<<<<< HEAD
sb.append(", vFamilyOpenid=").append(vFamilyOpenid);
=======
>>>>>>> 66a3a513346e2d2bf80c7ca2d9fe9309158d90d4
sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);
sb.append(", ext1=").append(ext1);

3
service/src/main/java/com/hfkj/entity/BsUserExample.java
Unescape View File

@ -725,7 +725,6 @@ public class BsUserExample {
return (Criteria) this;
}
<<<<<<< HEAD
public Criteria andVFamilyOpenidIsNull() {
addCriterion("v_family_openid is null");
return (Criteria) this;
@ -796,8 +795,6 @@ public class BsUserExample {
return (Criteria) this;
}
=======
>>>>>>> 66a3a513346e2d2bf80c7ca2d9fe9309158d90d4
public Criteria andCreateTimeIsNull() {
addCriterion("create_time is null");
return (Criteria) this;

Write Preview
Loading…
Cancel
Save