From 67f2d8fb6220ce4a2fe639b2c6176414c3ef8779 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期四, 29 八月 2024 17:56:16 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/activity/RepoActivityDto.java | 5 +++++
phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/activity/RepoActivityDto.java b/phis-feign/src/main/java/com/hz/his/dto/activity/RepoActivityDto.java
index f6e80a9..d2492a6 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/activity/RepoActivityDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/activity/RepoActivityDto.java
@@ -14,8 +14,13 @@
/** 澶嶈喘娲诲姩id */
private String activityId;
+ /** 澶嶈喘娲诲姩鍒嗙粍id */
+ private String groupId;
/** 鐢ㄦ埛id */
private String userId;
+ /** 澶嶈喘鍟嗗搧skuId */
+ private List<String> skuIdList;
+
/** 闄愬埗鐢ㄦ埛浼氬憳绛夌骇(澶氫釜閫楀彿鍒嗛殧锛岀┖鍒欎笉闄愬埗) */
private String limitVipLevel;
/** 闄愬埗闂ㄥ簵id */
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 d692ebb..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
@@ -20,7 +20,7 @@
/**浠锋牸鏌ヨ 鏈�灏忎环鏍� 鏈�澶т环鏍�*/
private String minPrice;
private String maxPrice;
- /**鏌ヨ鍖哄垎 0=椤圭洰鍒嗙被鏌ヨ 1=璇夋眰鍒嗙被鏌ヨ**/
- private Integer searchType;
+ /**鏌ヨ鍖哄垎 0=椤圭洰鍒嗙被鏌ヨ 1=璇夋眰鍒嗙被鏌ヨ 榛樿鏌ヨ璇夋眰鍒嗙被**/
+ private Integer searchType = 1;
}
--
Gitblit v1.8.0