Merge remote-tracking branch 'origin/master'

luodangjia

2024-11-06 d6ef18f23c4b298cb9b977ab3a5d65e2f4a39fe2

 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;
@@ -51,4 +55,8 @@
    @TableField("state")
    private Integer state;

    @ApiModelProperty("微信OpenId")
    @TableField("open_id")
    private String openId;

}