Просмотр исходного кода

Merge tag 'refs/tags/jenkins-back_end_wechat-111' into release

test
release
Stormeye Wu 7 лет назад
Родитель
Сommit
f4b18aac2a
2 измененных файлов: 1 добавлений и 17 удалений
  1. +0
    -11
      mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java
  2. +1
    -6
      mallinkService/src/main/resources/mapper/WxCUserMapper.xml

+ 0
- 11
mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java Просмотреть файл

@@ -157,9 +157,6 @@ public class WxCUser implements Serializable {
private Date subsSubscribeTime;
@io.swagger.annotations.ApiModelProperty(value="关注订阅号Scene",name="subsSubscribeScene")
private String subsSubscribeScene;
/**积分**/
@io.swagger.annotations.ApiModelProperty(value="积分",name="credit")
private Integer credit;


//渠道名称
@@ -491,14 +488,6 @@ public class WxCUser implements Serializable {
this.subsSubscribeScene = subsSubscribeScene;
}

public Integer getCredit() {
return credit;
}

public void setCredit(Integer credit) {
this.credit = credit;
}

public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")


+ 1
- 6
mallinkService/src/main/resources/mapper/WxCUserMapper.xml Просмотреть файл

@@ -43,7 +43,6 @@
<result column="subs_subscribe" jdbcType="TINYINT" property="subsSubscribe"/>
<result column="subs_subscribe_time" jdbcType="TIMESTAMP" property="subsSubscribeTime"/>
<result column="subs_subscribe_scene" jdbcType="VARCHAR" property="subsSubscribeScene"/>
<result column="credit" jdbcType="INTEGER" property="credit"/>
</resultMap>

<sql id="allColumns">
@@ -54,7 +53,7 @@
`login_count`, `extra_info`, `is_subscribe`,
`open_app_id`,
`mp_open_id`,`mp_app_id`,`mp_subscribe`,`mp_subscribe_time`,`mp_subscribe_scene`,
`subs_open_id`,`subs_app_id`,`subs_subscribe`,`subs_subscribe_time`,`subs_subscribe_scene`,`credit`
`subs_open_id`,`subs_app_id`,`subs_subscribe`,`subs_subscribe_time`,`subs_subscribe_scene`
</sql>

<sql id="dynamicWhereConditions">
@@ -196,10 +195,6 @@
and `subs_app_id` = #{subsAppId}
</if>

<if test=" null != credit ">
and `credit` = #{credit}
</if>

<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">


Загрузка…
Отмена
Сохранить