From 1e65523fba19e99dbdf71d0a731a7747a2c9d4e0 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 23 八月 2024 16:20:08 +0800
Subject: [PATCH] Merge branch 'master-xlk' into master-xlk-test

---
 phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java b/phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java
index 12dc6c9..79f73b7 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java
@@ -3,6 +3,8 @@
 import com.hz.his.dto.PageDto;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author fwq
  * 椤圭洰鎵╁睍
@@ -11,9 +13,14 @@
 public class ProjectDto extends PageDto {
     /**鏇存柊鏃堕棿*/
     private String editTime;
-
+    /**sku鏍囪瘑*/
+    private List<String> skuIdList;
+    /**骞冲彴appId*/
+    private String appId;
     /**浠锋牸鏌ヨ 鏈�灏忎环鏍� 鏈�澶т环鏍�*/
     private String minPrice;
     private String maxPrice;
+    /**鏌ヨ鍖哄垎 0=椤圭洰鍒嗙被鏌ヨ 1=璇夋眰鍒嗙被鏌ヨ 榛樿鏌ヨ璇夋眰鍒嗙被**/
+    private Integer searchType = 1;
 
 }

--
Gitblit v1.8.0