Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-03 b6a7f6e41467f73f26fc7f209652e19ff26c3752

 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;

}