From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan
---
phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
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