Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
SongZhang 2024-09-27 17:42:26 +08:00
commit 808e0a43bd
1 changed files with 8 additions and 0 deletions

View File

@ -50,6 +50,10 @@ public class TbMerchantThirdApply implements Serializable {
@ApiModelProperty(value = "商户应用")
private String appId;
@Column(name = "`alipay_app_id`",unique = true)
@ApiModelProperty(value = "支付宝商户应用")
private String alipayAppId;
@Column(name = "`small_appid`")
@ApiModelProperty(value = "微信小程序appid")
private String smallAppid;
@ -66,6 +70,10 @@ public class TbMerchantThirdApply implements Serializable {
@ApiModelProperty(value = "商户token")
private String appToken;
@Column(name = "`alipay_app_token`")
@ApiModelProperty(value = "支付宝商户token")
private String alipayAppToken;
@Column(name = "`status`")
@ApiModelProperty(value = "审核详情-1未提交0已提交不可修改 1审核通过")
private Integer status;