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/order/OrderDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java | 1 +
phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java | 11 ++++++++++-
3 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java
index 7e11ae3..b5ef7ad 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java
@@ -49,4 +49,6 @@
/**鏄惁杩囨护宸查��娆剧殑鍗� 0 鍚� 1 鏄�*/
private Integer isRefund;
+ /** 鏄惁鍓旈櫎鍗″寘璁㈠崟 */
+ private Integer isNotCardBag;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
index 77492fe..4120034 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
@@ -32,6 +32,7 @@
* @param file 鏂囦欢
* @param folderCode 瀛樺偍鏂囦欢澶�,姣斿鍟嗗搧杞挱鍥�:/goods/banner
* @param bucketName 瀛樺偍妗跺悕绉�
+ * @param fileName 鏂囦欢鍚嶇О锛堝惈鍚庣紑锛�,濡傦細test.xml
* @return
*/
@RequestMapping(value = "/cos/upload-multipart/name",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
diff --git a/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java b/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java
index 243414e..f1258b2 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java
@@ -455,8 +455,13 @@
private String mainChannelName;
/**鎵ц閮ㄤ綅*/
private String deductionBodyPartInfo;
+ /**瀵煎嚭鐗堟湰*/
+ private String exportVersion = EXPORT_VERSION_V1;
-
+ /**瀵煎嚭鐗堟湰-v1*/
+ public static final String EXPORT_VERSION_V1 = "v1";
+ /**瀵煎嚭鐗堟湰-v2*/
+ public static final String EXPORT_VERSION_V2 = "v2";
public Integer getPageNum() {
if(pageNum == null){
@@ -479,4 +484,8 @@
public void setPageSize(Integer pageSize) {
this.pageSize = pageSize;
}
+
+
+
+
}
--
Gitblit v1.8.0