From 6cc93c8679746eb9a9c6e53875336e8322aa34cb Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 05 九月 2022 15:46:14 +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 6fd69ed..1630580 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
@@ -41,7 +41,7 @@
/**crm蹇呭～ 寮�鍙戜汉鍚嶇О(娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鍚嶇О) 涓夊皯璇达細crm灏卞～鐢ㄦ埛*/
private String developerName;
- /**蹇呭～ 鐢ㄦ埛Id */
+ /**蹇呭～ 璁㈠崟鎵�灞炵敤鎴稩d */
private String userId;
/**crm蹇呭～ 璁㈠崟娓犻亾鏍囪瘑锛堟笭閬�/鐢ㄦ埛锛�,涓夊皯璇达細crm蹇呭～ */
--
Gitblit v1.8.0