Merge remote-tracking branch 'origin/master'

puzhibing

2024-09-12 08564aa83ad1b664eff494e34b1fb73d009dde7c

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java

@@ -106,8 +106,8 @@
    private BigDecimal vipPaymentAmount;

    @ApiModelProperty(value = "优惠券说明")
    @TableField("explain")
    private String explain;
    @TableField("explains")
    private String explains;

    @ApiModelProperty(value = "说明")
    @TableField("remark")