From f503cd734ad8b56695e6089811379c91d8d07461 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sun, 19 Aug 2018 14:04:47 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E9=93=BA=E5=95=86=E6=88=B7][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E5=95=86=E6=88=B7=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/simple/domain/po/WxMerchantBUser.java | 24 ++++++++++++++----- .../mapper/WxMerchantBUserMapper.xml | 9 +++++-- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMerchantBUser.java b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantBUser.java index 59fc629cb..f5eea0360 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMerchantBUser.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantBUser.java @@ -2,13 +2,13 @@ package com.simple.domain.po; 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.Table; +import javax.persistence.Transient; import java.io.Serializable; +import java.util.Date; +import java.util.List; +import java.util.UUID; @Table(name = "wx_merchant_b_user") public class WxMerchantBUser implements Serializable { @@ -74,6 +74,10 @@ public class WxMerchantBUser implements Serializable { /*用户过期时间**/ @io.swagger.annotations.ApiModelProperty(value="用户过期时间",name="expireTime") private Date expireTime; + + @io.swagger.annotations.ApiModelProperty(value="name",name="name") + private String name; + public String getTenantId() { return tenantId; } @@ -135,7 +139,13 @@ public class WxMerchantBUser implements Serializable { expireTime = _expireTime; } + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } public static enum Field { @@ -150,7 +160,9 @@ public class WxMerchantBUser implements Serializable { ,AppId_ASC("`appId` ASC"),AppId_DESC("`appId` DESC") ,Token_ASC("`token` ASC"),Token_DESC("`token` DESC") ,ExpireTime_ASC("`expireTime` ASC"),ExpireTime_DESC("`expireTime` DESC") - ; + ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") + + ; private String value; Field(String value){ this.value = value; diff --git a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml index 5e30b300e..6eb59a647 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml @@ -13,10 +13,12 @@ + + - `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` @@ -75,7 +77,10 @@ and `expire_time` = #{expireTime} - + + + and `name` = #{name} + and id in