Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-09-24 ad0b0dde969cdb8939e9f34c4eb951d79d1dd939

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

@@ -148,7 +148,9 @@
    @TableField("type")
    private Integer type;


    @ApiModelProperty(value = "优惠券名称和张数 后台列表展示使用")
    @TableField(exist = false)
    private String couponName;


}