Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-05 9adfc0c5aa084bc61807ce43badf8b9f48b588c3

 src/main/java/com/mzl/flower/entity/system/User.java

@@ -35,4 +35,8 @@

    @TableField("third_id")
    private String thirdId;

    @TableField("vip_grade")
    private String vipGrade;

}