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

huliguo

6 天以前 c897a68da55d63439826d37be3cb13c5c0f95a48

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

@@ -23,6 +23,6 @@
    private Integer buyNum;

    @ApiModelProperty(value = "用户优惠券id")
    private String memberCouponId;
    private Long memberCouponId;

}