Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-01-13 e8d2134c739ebd98da8c91599a1339b677f975f6

 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 = "添加时间")