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/dto/report/OperationalStatementsVo.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/OperationalStatementsVo.java b/phis-feign/src/main/java/com/hz/his/dto/report/OperationalStatementsVo.java
index 861f8aa..508fa58 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/OperationalStatementsVo.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/OperationalStatementsVo.java
@@ -16,7 +16,8 @@
private String month;
/**鏈堜唤:yyyy-MM-dd*/
private String day;
-
+ /**鐢ㄦ埛澧為暱娓犻亾:1鏄�,0鍚�*/
+ private Integer selectUser;
/**闂ㄥ簵鏍囪瘑*/
private String shopId;
/**闂ㄥ簵鏍囪瘑闆嗗悎*/
@@ -33,6 +34,10 @@
private String loginCnName;
/**鐧诲綍鍛樺伐鍞竴瀛楃涓�*/
private String loginEmpStr;
+ /** 鏄惁杩囨护娴嬭瘯鐢ㄦ埛璐﹀彿 */
+ private Integer isFilterTestAccount;
+ /**鏄惁鏌ヨ澶嶈喘鏁版嵁,0鍚�1鏄�*/
+ private Integer isSelectRepurchase = 0;
public List<String> getShopIdList() {
if(shopIdList == null){
--
Gitblit v1.8.0