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

无关风月

9 天以前 f135f2c8c08b16ac25a4e8e0398418ab3ce1e620

 ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/RecoveryServePrice.java

@@ -41,4 +41,8 @@
    @TableField("city")
    private String city;

    @ApiModelProperty("对应城市code")
    @TableField("city_code")
    private String cityCode;

}