From 58d2e3646fe5b911e2d3110679b4ece5f38cad16 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 12 十二月 2022 15:07:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-test

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

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
index ee862c8..52a1938 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
@@ -54,7 +54,7 @@
     /**闈炲繀濉� 璁㈠崟鎺ㄨ崘浜哄悕绉�(鍐椾綑),涓夊皯璇达細crm蹇呭~ 涓嶄紶,鍚庡彴澶勭悊*/
     private String inviteeName;
 
-    /**蹇呭~ 鍚屾鐘舵��0鍚�1鏄� ,濡傛灉瑕佸悓姝ュ埌棰嗗缓蹇呭~1锛屽惁鍒�0(涓嶄紶,鍚庡彴绾夸笂榛樿鍚屾,娴嬭瘯鐜榛樿涓嶅悓姝�)*/
+    /**蹇呭~ 鍚屾鐘舵��0鍚�1鏄� ,濡傛灉瑕佸悓姝ュ埌棰嗗缓蹇呭~1锛屽惁鍒�0*/
     private int hisSynStatus;
 
     /**蹇呭~ 璁㈠崟鎬婚噾棰�(璁㈠崟绫诲瀷鏄厖鍊艰鍗曞繀濉�,鍚﹀垯闈炲繀濉�) */

--
Gitblit v1.8.0