From b81701324e8db60da4ad46d5f7950dddca702cc7 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 11 十二月 2023 17:15:26 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 crm-platform-feign/src/main/java/com/hz/crm/dto/GoodsSkuDto.java |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/crm-platform-feign/src/main/java/com/hz/crm/dto/GoodsSkuDto.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/GoodsSkuDto.java
index ba495d4..24b955b 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/dto/GoodsSkuDto.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/GoodsSkuDto.java
@@ -3,6 +3,8 @@
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 鍟嗗搧sku鎵╁睍
  * */
@@ -15,7 +17,30 @@
     private String keyWord;
     /**鍟嗗搧绫诲瀷*/
     private Integer goodsType;
-    /**鏄惁杩囨护鍥㈣喘鍟嗗搧:1杩囨护(涓嶈繑鍥�)鍥㈣喘鍟嗗搧,0杩斿洖*/
+    /**鏄惁杩囨护鍥㈣喘鍟嗗搧:1杩囨护(涓嶈繑鍥�)鍥㈣喘鍟嗗搧,0涓嶈繃婊よ繑鍥�*/
     private Integer isFilterGroup;
+    /**鏄惁鍥㈣喘鍟嗗搧,0鍚�1鏄�*/
+    private Integer isGroup;
+    /**涓嶅彲鍦℉IS鍔╂墜寮�鍗曪紱1鏄紱0鍚�*/
+    private Integer notPhisOrder;
+    /**鏄惁杩囨护绉垎鍟嗗搧:1杩囨护(涓嶈繑鍥�)绉垎鍟嗗搧,0涓嶈繃婊よ繑鍥�*/
+    private Integer isFilterIntegral;
+    /**鏈�浣庝环*/
+    private String minPrice;
+    /**鏈�楂樹环*/
+    private String maxPrice;
+    /**鏄惁鐢熺編:0涓嶆槸,1鏄�*/
+    private Integer isShMei;
+    private Integer isLifeBeauty;
+    /**鐢熺編椤圭洰鏍囪瘑闆嗗悎*/
+    private List<String> shMeiIdList;
+    /**鏄惁鏌ヨ鎯�:0涓嶆槸,1鏄�*/
+    private Integer isInfo;
+    /** his绯荤粺鍟嗗搧瀵瑰簲id */
+    private String hisId;
+    /**閫楀彿鍒嗛殧id*/
+    private String ids;
 
+    /** 璇夋眰鍒嗙被idList */
+    private List<String> appealTypeIdList;
 }

--
Gitblit v1.8.0