From 525c120c93c2c25d8dfc59d4fac234b80b37d1c0 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 十二月 2024 09:21:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
manage/src/main/java/com/jilongda/manage/model/TOrder.java | 35 +++++++++++++++--------------------
1 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/model/TOrder.java b/manage/src/main/java/com/jilongda/manage/model/TOrder.java
index 8de65b8..8bd3567 100644
--- a/manage/src/main/java/com/jilongda/manage/model/TOrder.java
+++ b/manage/src/main/java/com/jilongda/manage/model/TOrder.java
@@ -7,6 +7,8 @@
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
+
+import com.jilongda.common.pojo.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,7 +26,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_order")
@ApiModel(value="TOrder对象", description="销售订单表")
-public class TOrder implements Serializable {
+public class TOrder extends BaseModel {
private static final long serialVersionUID = 1L;
@@ -75,24 +77,6 @@
@ApiModelProperty(value = "折射率")
@TableField("refractiveIndex")
private String refractiveIndex;
-
- @ApiModelProperty(value = "创建时间")
- @TableField("createTime")
- private LocalDateTime createTime;
-
- @ApiModelProperty(value = "修改时间")
- @TableField("updateTime")
- private LocalDateTime updateTime;
-
- @TableField("createBy")
- private String createBy;
-
- @TableField("updateBy")
- private String updateBy;
-
- @ApiModelProperty(value = "是否删除 0否1是")
- @TableField("isDelete")
- private Integer isDelete;
@ApiModelProperty(value = "店铺员工id")
@TableField("sysId")
@@ -157,6 +141,17 @@
@ApiModelProperty(value = "核算时间")
@TableField("accountingTime")
private LocalDateTime accountingTime;
-
+ @ApiModelProperty(value = "用户姓名")
+ @TableField("realName")
+ private String realName;
+ @ApiModelProperty(value = "用户手机号")
+ @TableField("phone")
+ private String phone;
+ @ApiModelProperty(value = "用户年龄")
+ @TableField("age")
+ private Integer age;
+ @ApiModelProperty(value = "用户性别 1男2女")
+ @TableField("gender")
+ private Integer gender;
}
--
Gitblit v1.7.1