From 683592139be3975b93234dcaf71e29c8aee40352 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 16 一月 2025 20:25:03 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsBargainPrice.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsBargainPrice.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsBargainPrice.java
index 7723deb..60fe648 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsBargainPrice.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsBargainPrice.java
@@ -44,7 +44,7 @@
@ApiModelProperty(value = "审核人id")
@TableField("audit_user_id")
- private Integer auditUserId;
+ private Long auditUserId;
@ApiModelProperty(value = "审核时间")
@TableField("audit_time")
@@ -56,7 +56,6 @@
@ApiModelProperty(value = "删除（0=否，1=是）")
@TableField("del_flag")
- @TableLogic
private Integer delFlag;
@ApiModelProperty(value = "添加时间")
@@ -70,5 +69,32 @@
@TableField(exist = false)
private List<GoodsBargainPriceDetail> goodsBargainPriceDetailList;
+ @ApiModelProperty(value = "商品名称")
+ @TableField(exist = false)
+ private String goodsName;
+
+ @ApiModelProperty(value = "所属分类")
+ @TableField(exist = false)
+ private String categoryName;
+
+ @ApiModelProperty(value = "分类id")
+ @TableField(exist = false)
+ private Integer categoryId;
+
+ @ApiModelProperty(value = "门店名称")
+ @TableField(exist = false)
+ private String shopName;
+
+ @ApiModelProperty(value = "店长名称")
+ @TableField(exist = false)
+ private String ownerName;
+
+ @ApiModelProperty(value = "店长手机号")
+ @TableField(exist = false)
+ private String ownerPhone;
+
+ @ApiModelProperty(value = "商品类型")
+ @TableField(exist = false)
+ private Integer goodsType;
}
--
Gitblit v1.7.1