Merge remote-tracking branch 'origin/master' into master-v2

gongzuming

2024-09-20 875de0f786639bc089ff54aeb9a2fcabdf5f832b

 src/main/java/com/mzl/flower/dto/request/payment/OrderCommitDTO.java

@@ -26,4 +26,10 @@

    @NotBlank(message = "微信code不能为空")
    private String wxcode;

    @ApiModelProperty(value = "用户优惠券id")
    private String couponRecordId;

    @ApiModelProperty(value = "用户积分商品兑换券id列表")
    private List<Long> goodsRecordIdList;
}