From bfc4eee4dad838e96059c9e0c2f5e01722ab7284 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 04 十一月 2024 16:58:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java
index cead23c..4e0d5ec 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,7 +22,6 @@
* @since 2024-08-08
*/
@Data
-@EqualsAndHashCode(callSuper = false)
@TableName("t_parking_record")
@ApiModel(value="TParkingRecord对象", description="")
public class TParkingRecord implements Serializable {
@@ -35,14 +35,19 @@
@ApiModelProperty(value = "用户id")
@TableField("app_user_id")
private Long appUserId;
+
+ @ApiModelProperty(value = "订单标题")
+ @TableField("title")
+ private String title;
+
+ @ApiModelProperty(value = "停车场名称")
+ @TableField("name")
+ private String name;
@ApiModelProperty(value = "车牌号")
@TableField("license_plate")
private String licensePlate;
-
- @TableField(exist = false)
- private String name;
-
+
@TableField(exist = false)
private String uid;
@@ -64,10 +69,12 @@
@ApiModelProperty(value = "入场时间")
@TableField("in_parking_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime inParkingTime;
@ApiModelProperty(value = "出场时间")
@TableField("out_parking_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime outParkingTime;
@ApiModelProperty(value = "停车时长（分钟）")
@@ -77,6 +84,14 @@
@ApiModelProperty(value = "总费用")
@TableField("order_amount")
private BigDecimal orderAmount;
+
+ @ApiModelProperty(value = "支付金额")
+ @TableField("payment")
+ private BigDecimal payment;
+
+ @ApiModelProperty(value = "支付方式")
+ @TableField("payType")
+ private String payType;
@ApiModelProperty(value = "状态（1=已进场，2=已出场，3=已缴费出场）")
@TableField("status")
@@ -88,6 +103,7 @@
@ApiModelProperty(value = "添加时间")
@TableField("create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime;
@ApiModelProperty(value = "超时占位费")
@@ -110,5 +126,7 @@
@TableField("serialnumber")
private String serialnumber;
+ @TableField(exist = false)
+ private String parkName;
}
--
Gitblit v1.7.1