From d5bd88b13d5ceb8bcdcfe0eb3b4a6b5fd27f1fc8 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期日, 09 十月 2022 18:48:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 crm-platform-feign/src/main/java/com/hz/crm/dto/GoodsSkuDto.java |    5 +++--
 1 files changed, 3 insertions(+), 2 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..9084f5a 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
@@ -15,7 +15,8 @@
     private String keyWord;
     /**鍟嗗搧绫诲瀷*/
     private Integer goodsType;
-    /**鏄惁杩囨护鍥㈣喘鍟嗗搧:1杩囨护(涓嶈繑鍥�)鍥㈣喘鍟嗗搧,0杩斿洖*/
+    /**鏄惁杩囨护鍥㈣喘鍟嗗搧:1杩囨护(涓嶈繑鍥�)鍥㈣喘鍟嗗搧,0涓嶈繃婊よ繑鍥�*/
     private Integer isFilterGroup;
-
+    /**鏄惁鍥㈣喘鍟嗗搧,0鍚�1鏄�*/
+    private Integer isGroup;
 }

--
Gitblit v1.8.0