Merge branch 'master' of ssh://120.76.84.145:20202/java/HongRuiTang into ma...

jiangqs

2023-09-01 dfe810a2108e479c4ed4f8d24dd181140afd8730

 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;
}