From 80060571acf0c50e868bb0d7368d690d2f496745 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 02 Jun 2022 16:05:42 +0800
Subject: [PATCH] Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz

---
 src/main/java/cc/mrbird/febs/mall/dto/MallGoodsQueryDto.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/dto/MallGoodsQueryDto.java b/src/main/java/cc/mrbird/febs/mall/dto/MallGoodsQueryDto.java
index d4b6314..93b29a8 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/MallGoodsQueryDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/MallGoodsQueryDto.java
@@ -34,4 +34,10 @@
 
     @ApiModelProperty(value = "是否热卖", example = "1是2否")
     private Integer isHot;
+
+    @ApiModelProperty(value = "是否套餐 1-普通商品 2-套餐", example = "2")
+    private Integer isNormal;
+
+    @ApiModelProperty(value = "1-付费商品 2-积分商品")
+    private Integer goodsType;
 }

--
Gitblit v1.9.1