Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-01-14 2c44da15d2ed01cefdc0d9e12497ebbd0ef2c8f9

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

@@ -48,7 +48,7 @@
    @TableField("purchase_limit")
    private Integer purchaseLimit;

    @ApiModelProperty(value = "配送方式（1=自提，2=快递，1,2 = 自提+快递）")
    @ApiModelProperty(value = "配送方式（1=自提，2=快递）")
    @TableField("distribution_mode")
    private String distributionMode;