Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-11-06 32e9d5fd0a1eb454b0a7f84adf068bf7b36d6956

 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;


}