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

Pu Zhibing

7 天以前 64264bb278bbfaa8df29f5f19a59d4e8345b04aa

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

@@ -18,4 +18,7 @@

    @ApiModelProperty(value = "商户id",hidden = true)
    private Long shopId;

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