Merge branch 'tkk' into test
This commit is contained in:
commit
7467cfa444
|
|
@ -15,11 +15,15 @@
|
|||
*/
|
||||
package cn.ysk.cashier.pojo.shop;
|
||||
|
||||
import lombok.Data;
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import cn.hutool.core.bean.copier.CopyOptions;
|
||||
import javax.persistence.*;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Id;
|
||||
import javax.persistence.Table;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
|
|
@ -47,9 +51,13 @@ public class TbMerchantThirdApply implements Serializable {
|
|||
private String appId;
|
||||
|
||||
@Column(name = "`small_appid`")
|
||||
@ApiModelProperty(value = "小程序appid")
|
||||
@ApiModelProperty(value = "微信小程序appid")
|
||||
private String smallAppid;
|
||||
|
||||
@Column(name = "`small_appid`")
|
||||
@ApiModelProperty(value = "支付宝小程序appid")
|
||||
private String alipaySmallAppid;
|
||||
|
||||
@Column(name = "`store_id`")
|
||||
@ApiModelProperty(value = "店铺id")
|
||||
private String storeId;
|
||||
|
|
|
|||
Loading…
Reference in New Issue