Merge remote-tracking branch 'origin/master'

xuhy

2024-10-16 caa1d7baa3aa9cbf45f7ba41fbcdccd1c4c17727

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/InfoCouponDto.java

@@ -20,6 +20,7 @@
    @TableField("name")
    private String name;
    private Integer type;
    private Integer couponId;
    @ApiModelProperty(value = "优惠方式（1=满减，2=抵扣）")
    @TableField("preferential_mode")
    private Integer preferentialMode;