From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java
index c63d236..f5e506b 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java
@@ -74,12 +74,14 @@
     //鍜ㄨ鏂瑰紡鍚嶇О
     private String methodCodeName;
 
+    /**鏈垚浜ゅ師鍥�*/
+    private String description;
     /**鐢ㄦ埛鑱屼笟*/
     private String userCareer;
     /**浣滄伅*/
     private String workRest;
     /**鎬ф牸*/
-    private String character;
+    private String characterInfo;
     /**鐢ㄦ埛鍠滃ソ*/
     private String userLike;
     /**濠氬Щ鐘跺喌*/

--
Gitblit v1.8.0