From e0623f1a914ecbc99d5926c0df3cf26032c02499 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期三, 01 一月 2025 17:11:50 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng --- ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java index 3a5830a..1745681 100644 --- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java +++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java @@ -163,12 +163,31 @@ @ApiModelProperty(value = "删除(0=否,1=是)") @TableField("del_flag") - @TableLogic private Integer delFlag; @ApiModelProperty(value = "添加时间") @TableField("create_time") private LocalDateTime createTime; + + @ApiModelProperty("报备商户号") + @TableField("tradeMerchantNo") + private String tradeMerchantNo; + + @ApiModelProperty("收款银行卡号") + @TableField("receiverAccountNoEnc") + private String receiverAccountNoEnc; + + @ApiModelProperty("收款银行卡持卡人名称") + @TableField("receiverNameEnc") + private String receiverNameEnc; + + @ApiModelProperty("账户类型(对私账户201,对公账户204)") + @TableField("receiverAccountType") + private Integer receiverAccountType; + + @ApiModelProperty("收款账户联行号") + @TableField("receiverBankChannelNo") + private String receiverBankChannelNo; -- Gitblit v1.7.1