From 238ad8112dc926eeaad8e327607eeba7858b8a48 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 21:31:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Goods.java | 23 ++++++++++++++++++++---
1 files changed, 20 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 a9e902d..63bc9aa 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
@@ -1,6 +1,7 @@
package com.ruoyi.other.api.domain;
import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,7 +24,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_goods")
@ApiModel(value="Goods对象", description="")
-public class Goods implements Serializable {
+public class Goods extends BasePage implements Serializable {
private static final long serialVersionUID = 1L;
@@ -47,7 +48,7 @@
@TableField("purchase_limit")
private Integer purchaseLimit;
- @ApiModelProperty(value = "配送方式（1=自提，2=快递，1,2 = 自提+快递）")
+ @ApiModelProperty(value = "配送方式（1=自提，2=快递）")
@TableField("distribution_mode")
private String distributionMode;
@@ -103,7 +104,7 @@
@TableField("sale_num")
private Integer saleNum;
- @ApiModelProperty(value = "商品权限 逗号分隔（0=全部，1=游客，2=普通会员，3=黄金会员，4=钻石会员，5=准代理，6=代理，7=总代，8=合伙人）")
+ @ApiModelProperty(value = "商品权限 逗号分隔（-1=全部，0=游客，1=普通会员，2=黄金会员，3=钻石会员，4=准代理，5=代理，6=总代，7=合伙人）")
@TableField("commodity_authority")
private String commodityAuthority;
@@ -148,6 +149,22 @@
@TableField(exist = false)
private Integer showStatus;
+ @TableField(exist = false)
+ private String payMethod;
+
+ /**
+ * 排序字段
+ */
+ @TableField(exist = false)
+ private String orderByColumn;
+
+ /**
+ * 排序方式
+ */
+ @TableField(exist = false)
+ private String isAsc;
+
+
public String getIdStr() {
return String.valueOf(id);
}
--
Gitblit v1.7.1