Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-03-18 f615ec5c9239327740948501627545f8e78e2a9e

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java

@@ -152,6 +152,7 @@
    @TableField("balance")
    private BigDecimal balance;


    @ApiModelProperty(value = "门店订单总数")
    @TableField("order_number")
    private Integer orderNumber;