From d34b3987a7c89c29a74eb7d3525b2a486eeaca10 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期三, 08 一月 2025 17:17:55 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou --- ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Withdraw.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Withdraw.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Withdraw.java index 6244d4a..e9249d0 100644 --- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Withdraw.java +++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Withdraw.java @@ -41,7 +41,7 @@ @ApiModelProperty("申请时间") @TableField("apply_for_time") - @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date applyForTime; @ApiModelProperty("申请金额") @@ -60,5 +60,9 @@ @TableField("order_id") private String orderId; + @ApiModelProperty("城市code") + @TableField("city_code") + private String cityCode; + } -- Gitblit v1.7.1