Merge remote-tracking branch 'origin/master'

xuhy

2025-01-13 98de7181a8e13420734f75d2eba62f1aef298643

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/User.java

@@ -35,6 +35,10 @@
    @TableField("city")
    private String city;

    @ApiModelProperty("城市编码")
    @TableField("city_code")
    private String cityCode;

    @ApiModelProperty("用户昵称")
    @TableField("nickname")
    private String nickname;