From 22c96f6b1cd3ebc7ec12e6556a48e1582639ddfd Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期三, 12 四月 2023 17:01:53 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java | 3 +++
phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java | 2 +-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java
index 5933add..da189cd 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java
@@ -21,6 +21,9 @@
/**鏍囩鍚嶇О*/
private String tagName;
+ /**鏍囩绫诲瀷缂栧彿*/
+ private String tagTypeNo;
+
/**鏍囩绫诲埆*/
private String tagTypeName;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java b/phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java
index 267103d..5c13906 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java
@@ -42,7 +42,7 @@
* },
* {
* (鏄惁鑷畾涔夋爣绛� 鏄�)"isCustom": 1,
- * (鏍囩绫诲瀷缂栧彿 娌℃湁绫诲瀷鍙互涓虹┖鎴栦笉浼�)"typeNo": "constellation",
+ * (鏍囩缂栧彿 娌℃湁鍙互涓虹┖鎴栦笉浼�)"tagNo": "constellation",
* (鏍囩缂栧彿)"tagName": "鐗涢┈搴�"
* }
* ],
--
Gitblit v1.8.0