Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

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

@@ -186,4 +186,7 @@
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Long SkuId;

    @ApiModelProperty(value = "优惠券id")
    private Long couponId;

}