Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-17 d0b043b8fa5f19d1295cac50fece0c65fceb3920

 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;
}