Sfoglia il codice sorgente

[商铺商户][修改]:商户添加名称字段

release_toaliyun_real
gongbiao 7 anni fa
parent
commit
f503cd734a
2 ha cambiato i file con 25 aggiunte e 8 eliminazioni
  1. +18
    -6
      mallinkService/src/main/java/com/simple/domain/po/WxMerchantBUser.java
  2. +7
    -2
      mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml

+ 18
- 6
mallinkService/src/main/java/com/simple/domain/po/WxMerchantBUser.java Vedi File

@@ -2,13 +2,13 @@ package com.simple.domain.po;


import com.simple.utils.BaseConstant; import com.simple.utils.BaseConstant;


import javax.persistence.*;
import java.util.*;
import java.math.*;
import javax.persistence.Transient;
import java.util.List;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
import java.util.List;
import java.util.UUID;


@Table(name = "wx_merchant_b_user") @Table(name = "wx_merchant_b_user")
public class WxMerchantBUser implements Serializable { public class WxMerchantBUser implements Serializable {
@@ -74,6 +74,10 @@ public class WxMerchantBUser implements Serializable {
/*用户过期时间**/ /*用户过期时间**/
@io.swagger.annotations.ApiModelProperty(value="用户过期时间",name="expireTime") @io.swagger.annotations.ApiModelProperty(value="用户过期时间",name="expireTime")
private Date expireTime; private Date expireTime;

@io.swagger.annotations.ApiModelProperty(value="name",name="name")
private String name;

public String getTenantId() { public String getTenantId() {
return tenantId; return tenantId;
} }
@@ -135,7 +139,13 @@ public class WxMerchantBUser implements Serializable {
expireTime = _expireTime; expireTime = _expireTime;
} }


public String getName() {
return name;
}


public void setName(String name) {
this.name = name;
}


public static enum Field public static enum Field
{ {
@@ -150,7 +160,9 @@ public class WxMerchantBUser implements Serializable {
,AppId_ASC("`appId` ASC"),AppId_DESC("`appId` DESC") ,AppId_ASC("`appId` ASC"),AppId_DESC("`appId` DESC")
,Token_ASC("`token` ASC"),Token_DESC("`token` DESC") ,Token_ASC("`token` ASC"),Token_DESC("`token` DESC")
,ExpireTime_ASC("`expireTime` ASC"),ExpireTime_DESC("`expireTime` DESC") ,ExpireTime_ASC("`expireTime` ASC"),ExpireTime_DESC("`expireTime` DESC")
;
,Name_ASC("`name` ASC"),Name_DESC("`name` DESC")

;
private String value; private String value;
Field(String value){ Field(String value){
this.value = value; this.value = value;


+ 7
- 2
mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml Vedi File

@@ -13,10 +13,12 @@
<result column="app_id" jdbcType="VARCHAR" property="appId" /> <result column="app_id" jdbcType="VARCHAR" property="appId" />
<result column="token" jdbcType="VARCHAR" property="token" /> <result column="token" jdbcType="VARCHAR" property="token" />
<result column="expire_time" jdbcType="TIMESTAMP" property="expireTime" /> <result column="expire_time" jdbcType="TIMESTAMP" property="expireTime" />
<result column="name" jdbcType="VARCHAR" property="name" />

</resultMap> </resultMap>
<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`b_user_id`,`phone`,`b_user_pwd`,`merchant_id`,`create_date`,`update_date`,`app_id`,`token`,`expire_time`
`id`,`tenant_id`,`b_user_id`,`phone`,`b_user_pwd`,`merchant_id`,`create_date`,`update_date`,`app_id`,`token`,`expire_time`,`name`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">
@@ -75,7 +77,10 @@
<if test=" null != expireTime "> <if test=" null != expireTime ">
and `expire_time` = #{expireTime} and `expire_time` = #{expireTime}
</if>
</if>
<if test=" null != name ">
and `name` = #{name}
</if>
<if test=" null != ids "> <if test=" null != ids ">
and id in and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">


Caricamento…
Annulla
Salva