Merge remote-tracking branch 'origin/master'

mitao

2024-06-18 fd97cde3d994a3aa6898ba862cd20d0c081012c3

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

@@ -6,6 +6,7 @@
import com.ruoyi.common.core.enums.GroupStatusEnum;
import com.ruoyi.common.core.enums.ListingStatusEnum;
import com.ruoyi.common.core.enums.StartStatusEnum;
import com.ruoyi.system.api.domain.Order;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -87,4 +88,7 @@
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Integer isGoodsGroupPurchase;

    @ApiModelProperty(value = "團購商品訂單")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Order order;
}