Merge remote-tracking branch 'origin/master'

CBin

2023-08-02 88b0f7ea048e9b201af0bc390f3da8840b11c899

 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;