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

huliguo

4 天以前 c897a68da55d63439826d37be3cb13c5c0f95a48

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AppActivityGoodsPageDto.java

@@ -19,4 +19,6 @@
    @ApiModelProperty(value = "商户id",hidden = true)
    private Long shopId;

    @ApiModelProperty(value = "定位获取商户id")
    private Long positionShopId;
}