Merge remote-tracking branch 'origin/master'

xuhy

2024-08-09 d7f599824d4ab79c35e6aacdc59d2581c28504b3

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

@@ -134,14 +134,7 @@
    @TableField("mall_exclusive_price")
    private Integer mallExclusivePrice;

    @ApiModelProperty(value = "添加时间")
    @TableField("create_time")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "删除（0=否，1=是）")
    @TableField("del_flag")
    @TableLogic
    private Integer delFlag;


}