From 01ca766fe9c777713e4174257766daf6573a4209 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期一, 08 五月 2023 17:45:48 +0800
Subject: [PATCH] Merge branch 'master' into master-test

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

diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
index 720798c..12f1a2c 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
@@ -10,7 +10,8 @@
  **/
 @Data
 public class CashierSettlementDto extends BaseQueryVo{
-
+    /**鏄惁鍗曢〉杩斿洖*/
+    private Integer selectReturn = 0;
     /**寮�鍗曞紑濮嬫椂闂�*/
     private Date startTime;
     /**寮�鍗曠粨鏉熸椂闂�*/

--
Gitblit v1.8.0