From 64e2700126f64883aa982a11660c71e43a2a9f84 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 19 一月 2024 17:18:37 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java
index f7e5f5d..2ae9bf2 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java
@@ -32,4 +32,6 @@
     private List<String> employeeIdList;
     /**缁熻绫诲瀷*/
     private String countType;
+    /**鏄惁缁熻椤鹃棶鏁版嵁*/
+    private Integer isCountAdviser = 0;
 }

--
Gitblit v1.8.0