Merge remote-tracking branch 'origin/master'

mitao

2024-06-19 d4f159d60acf6f263bfa4508a113c0feacd2f5b9

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/GoodsGroupPurchaseInfoVO.java

@@ -91,4 +91,8 @@
    @ApiModelProperty(value = "團購商品訂單")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Order order;

    @ApiModelProperty(value = "是收藏 1未收藏，2收藏")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Integer isCollection;
}