From 1cf06ae5c986e1661d6f1e4b50b5e8042f49b843 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期日, 03 十一月 2024 13:22:20 +0800 Subject: [PATCH] 合并代码 --- ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 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 3e5d867..ee04672 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 @@ -36,14 +36,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; @@ -122,5 +127,7 @@ @TableField("serialnumber") private String serialnumber; + @TableField(exist = false) + private String parkName; } -- Gitblit v1.7.1