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

huliguo

4 天以前 b646898adf3f2ad119dd9fd1c7c01d7f0742bf97

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

@@ -17,6 +17,6 @@
    @ApiModelProperty(value = "shopId",hidden = true)
    private Long shopId;

    @ApiModelProperty("商品类型1周期2服务3体验4单品")
    @ApiModelProperty(value="商品类型1周期2服务3体验4单品")
    private Integer goodsType;
}