Merge remote-tracking branch 'origin/master'

xuhy

2025-01-14 f6b20962bb0453683e9366a3f87b7ec9bfaed03c

 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")