czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tkk' into test

This commit is contained in:
Tankaikai 2024-09-29 09:42:03 +08:00
parent 4e14710e3d ae1a748ef2
commit 3c5c0f7f47
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbMerchantThirdApplyDto.java
View File

@ -56,9 +56,5 @@ public class TbMerchantThirdApplyDto implements Serializable {
/** shopId */
private Integer shopId;
private String alipayAppId;
private String alipayAppToken;
private String alipaySmallAppid;
}

9
eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbMerchantThirdApply.java
View File

@ -49,11 +49,6 @@ public class TbMerchantThirdApply implements Serializable {
@Column(name = "`app_id`",unique = true)
@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;
@ -70,10 +65,6 @@ 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;