From 3595b24ec3ea128e3aaf1fdd02373427d83e6f48 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 06 十一月 2024 19:03:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 6a147e5..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
@@ -22,7 +22,6 @@
* @since 2024-08-08
*/
@Data
-@EqualsAndHashCode(callSuper = false)
@TableName("t_parking_record")
@ApiModel(value="TParkingRecord对象", description="")
public class TParkingRecord implements Serializable {
@@ -37,6 +36,10 @@
@TableField("app_user_id")
private Long appUserId;
+ @ApiModelProperty(value = "订单标题")
+ @TableField("title")
+ private String title;
+
@ApiModelProperty(value = "停车场名称")
@TableField("name")
private String name;
@@ -44,7 +47,7 @@
@ApiModelProperty(value = "车牌号")
@TableField("license_plate")
private String licensePlate;
-
+
@TableField(exist = false)
private String uid;
@@ -123,5 +126,7 @@
@TableField("serialnumber")
private String serialnumber;
+ @TableField(exist = false)
+ private String parkName;
}
--
Gitblit v1.7.1