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

无关风月

2 天以前 3044a637a15e09d50ad733fd482c6e64e90df2f9

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Withdraw.java

@@ -68,4 +68,8 @@
    @TableField("order_id")
    private String orderId;

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

}