From e7d554f4f8f79eafaa2de3abe036d21e300fd14a Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 23 二月 2024 17:39:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

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

diff --git a/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceLabelDto.java b/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceLabelDto.java
index 94725e4..afa12b7 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceLabelDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceLabelDto.java
@@ -23,6 +23,8 @@
     private String labelInfoName;
     /**棰滆壊*/
     private String color;
+    /** 鍏朵粬淇℃伅 */
+    private AppearanceLabelInfoDto labelInfo;
 
     public AppearanceLabelDto() {
     }

--
Gitblit v1.8.0