From 609d91e1e62b1e8932b34b15b09baf02e7f09a93 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 09 十二月 2024 10:36:47 +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/Goods.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Goods.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Goods.java
index a41a2d3..4e6f8d7 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Goods.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Goods.java
@@ -28,7 +28,7 @@
@ApiModelProperty(value = "主键")
@TableId(value = "id", type = IdType.AUTO)
- private Long id;
+ private Integer id;
@ApiModelProperty(value = "名称")
@TableField("name")
@@ -102,9 +102,9 @@
@TableField("sale_num")
private Integer saleNum;
- @ApiModelProperty(value = "商品权限JSON（0=全部，1=游客，2=普通会员，3=黄金会员，4=钻石会员，5=准代理，6=代理，7=总代，8=合伙人）")
+ @ApiModelProperty(value = "商品权限 逗号分隔（0=全部，1=游客，2=普通会员，3=黄金会员，4=钻石会员，5=准代理，6=代理，7=总代，8=合伙人）")
@TableField("commodity_authority")
- private Integer commodityAuthority;
+ private String commodityAuthority;
@ApiModelProperty(value = "删除（0=否，1=是）")
@TableField("del_flag")
@@ -119,5 +119,8 @@
@TableField("status")
private Integer status;
+ @TableField(exist = false)
+ private Integer vipId;
+
}
--
Gitblit v1.7.1