Merge remote-tracking branch 'origin/master' into master-v2

gongzuming

2024-09-02 0d864c9bf892fd7c56600e197072e07c57847b34

 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;

}