From bdee6ad7dd52e083cbf6bca7fc1c7d3ec270f2a4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 22 八月 2024 11:46:26 +0800
Subject: [PATCH] 代码合并
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TGoods.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TGoods.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TGoods.java
index f4666eb..43fa2a1 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TGoods.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TGoods.java
@@ -1,6 +1,7 @@
package com.ruoyi.other.api.domain;
import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -22,7 +23,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_goods")
@ApiModel(value="TGoods对象", description="")
-public class TGoods implements Serializable {
+public class TGoods extends BasePojo {
private static final long serialVersionUID = 1L;
@@ -98,14 +99,12 @@
@TableField("status")
private Integer status;
- @ApiModelProperty(value = "添加时间")
- @TableField("create_time")
- private LocalDateTime createTime;
- @ApiModelProperty(value = "删除（0=否，1=是）")
- @TableField("del_flag")
- @TableLogic
- private Integer delFlag;
-
+ @ApiModelProperty(value = "销量")
+ @TableField(exist = false)
+ private Integer salesCount;
+ @ApiModelProperty(value = "1商品2优惠卷")
+ @TableField(exist = false)
+ private Integer goodType;
}
--
Gitblit v1.7.1