Merge remote-tracking branch 'origin/dev' into dev

无关风月

9 天以前 f135f2c8c08b16ac25a4e8e0398418ab3ce1e620

 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;