From 7c80276cc69e1341d9b03a9a90e799a80b517cd4 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 06 八月 2024 11:40:58 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan
---
phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/dto/order/OrderOtherFilesDto.java | 13 +++++++++++++
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/dto/PageDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 3 +++
5 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/PageDto.java b/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
index 3907d31..9640ea9 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
@@ -25,6 +25,8 @@
private List<String> typeIdList;
/**appid*/
private String appId;
+ /*** 闂ㄥ簵ID**/
+ private String shopId;
public Integer getPageNum() {
if(this.pageNum == null || this.pageNum < 0){
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderOtherFilesDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderOtherFilesDto.java
new file mode 100644
index 0000000..b16914e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderOtherFilesDto.java
@@ -0,0 +1,13 @@
+package com.hz.his.dto.order;
+
+
+import lombok.Data;
+
+@Data
+public class OrderOtherFilesDto {
+
+ /*** 鏂囦欢绫诲瀷 **/
+ private String fileType;
+ /*** 鏂囦欢璺緞**/
+ private String fileUrl;
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
index 97b8d87..48e7c8b 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
@@ -73,6 +73,9 @@
/**蹇呭～:閫�璐圭粺璁＄被鍨�(RefundRecord)*/
private String refundStatistics;
+ /**鏄惁褰掕繕鍟嗗搧 0=鍚� 1=鏄�*/
+ private Integer isReturnBack;
+
/**澶囩敤鍙傛暟*/
//鎬昏鍗曢寤烘爣璇�
private String hisOrderId;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
index 81e9e45..3a33e74 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
@@ -71,5 +71,7 @@
private String giveIncreaseInfo;
/**闈炲繀濉� 鍙互鍙備笌绉垎鎶垫墸缁撹处鐨勫晢鍝佹爣璇�*/
private List<String> canIntegralCashIdList;
+ /**闈炲繀濉� 鍏朵粬鎴浘鎴栬�呮枃浠朵笂浼� **/
+ private List<OrderOtherFilesDto> otherInfoFiles;
}
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 eee977b..d692ebb 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,5 +20,7 @@
/**浠锋牸鏌ヨ 鏈�灏忎环鏍� 鏈�澶т环鏍�*/
private String minPrice;
private String maxPrice;
+ /**鏌ヨ鍖哄垎 0=椤圭洰鍒嗙被鏌ヨ 1=璇夋眰鍒嗙被鏌ヨ**/
+ private Integer searchType;
}
--
Gitblit v1.8.0