From 3cb59ae9ddc31e62988e5c7feb6647b44f1c7cf8 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期五, 17 一月 2025 17:50:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java | 11 +++++++++++ 1 files changed, 11 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 e323fe5..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") @@ -214,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