Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

puzhibing

2025-01-04 77e1a3c262f53ed3234151058b8ec8196998ada0

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCancellationLog.java

@@ -34,7 +34,6 @@

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

    @ApiModelProperty(value = "添加时间")
@@ -49,5 +48,10 @@
    @TableField("vip_id")
    private Integer vipId;

    @TableField(exist = false)
    private String userName;
    @TableField(exist = false)
    private String userPhone;


}