From d20a4aade6f9ed5111b496ac9abdff9f05f81535 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 15 一月 2025 22:32:02 +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 | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 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 8020f36..b09a71e 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
@@ -144,6 +144,9 @@
@ApiModelProperty(value = "已提现金额")
@TableField("withdraw_money")
private BigDecimal withdrawMoney;
+ @ApiModelProperty(value = "审核中金额")
+ @TableField(exist = false)
+ private BigDecimal withdrawAuditMoney;
@ApiModelProperty(value = "余额")
@TableField("balance")
@@ -168,6 +171,26 @@
@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;
@ApiModelProperty(value = "省")
@@ -194,5 +217,13 @@
@TableField("district_code")
private String districtCode;
+ @TableField(exist = false)
+ private Double distance;
+ @TableField(exist = false)
+ private Double score;
+
+ @ApiModelProperty(value = "自己打分")
+ @TableField(exist = false)
+ private String myScore;
}
--
Gitblit v1.7.1