From 8019eb016f806c1166223b1e2f08c1f9d7a96117 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 十月 2024 18:10:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserCar.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserCar.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserCar.java
index 4bffc74..fc25220 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserCar.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserCar.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,13 +25,15 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_app_user_car")
@ApiModel(value="TAppUserCar对象", description="")
-public class TAppUserCar implements Serializable {
+public class TAppUserCar extends BasePojo {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键")
@TableId("id")
private Long id;
+ @TableField(exist = false)
+ private String uid;
@ApiModelProperty(value = "app用户id")
@TableField("app_user_id")
@@ -39,6 +42,12 @@
@ApiModelProperty(value = "车牌")
@TableField("license_plate")
private String licensePlate;
+
+
+ @ApiModelProperty(value = "车牌")
+ @TableField("pic")
+ private String pic;
+
@ApiModelProperty(value = "车辆品牌")
@TableField("vehicle_brand")
@@ -56,14 +65,7 @@
@TableField("endurance")
private String endurance;
- @ApiModelProperty(value = "添加时间")
- @TableField("create_time")
- private LocalDateTime createTime;
- @ApiModelProperty(value = "删除（0=否，1=是）")
- @TableField("del_flag")
- @TableLogic
- private Integer delFlag;
}
--
Gitblit v1.7.1