Merge remote-tracking branch 'origin/master'

luodangjia

2024-11-06 7e5a51f911b7f65b6c37e232b69dc18c6fb6a066

 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;