From fc9cac864414b566e3516f6702b716e8ed00e9dc Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 26 六月 2023 16:34:29 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java |    2 ++
 1 files changed, 2 insertions(+), 0 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 12f1a2c..e324612 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
@@ -32,6 +32,8 @@
     private String shopId;
     /**瀹㈡埛鎵�灞為棬搴�*/
     private String userShopId;
+    /**閿�鍞钩鍙�*/
+    private String sourceName;
 
     /*******淇濆瓨鍙傛暟********/
     /**鎿嶄綔浜烘爣璇�*/

--
Gitblit v1.8.0