Merge remote-tracking branch 'origin/2.0' into 2.0

huliguo

2025-07-25 c897a68da55d63439826d37be3cb13c5c0f95a48

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerShopGoodsEditDto.java

@@ -17,7 +17,7 @@
public class MerShopGoodsEditDto extends MerBaseDto {

    @ApiModelProperty(value = "商品id")
    private Long goodsId;
    private String goodsId;

    @ApiModelProperty(value = "售价")
    private BigDecimal salePrice;