Merge remote-tracking branch 'origin/master'

zhibing.pu

2024-09-07 4fd0278cda787a91eb35d95d6491f5485afe3e48

 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")