From fa38de5f649aece3f5643f31e343f16327adc94f Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期二, 09 八月 2022 17:19:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java |    2 +-
 phis-feign/src/main/java/com/hz/his/dto/user/project/UserPackageDto.java |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/project/UserPackageDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/project/UserPackageDto.java
index 1a97941..24170ac 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/project/UserPackageDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/project/UserPackageDto.java
@@ -12,8 +12,8 @@
 @Data
 public class UserPackageDto extends PageDto {
 
-    /**鏍囩鏍囪瘑闆嗗悎*/
-    private List<String> labelIdList;
+    /**鏍囩鍚嶇О闆嗗悎*/
+    private List<String> labelNameList;
     /**椤圭洰鏍囪瘑闆嗗悎*/
     private List<String> projectIdList;
     /**浼氬憳绛夌骇鍚嶇О闆嗗悎*/
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
index e3f5d45..f9a5f91 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -223,7 +223,7 @@
     Result userAppearanceInfo(@RequestParam("appearanceId") String appearanceId);
 
     /**
-     * 鑾峰彇浜虹兢鍖呭垪琛�(鍙紶绛涢�夌殑鍙傛暟:浼氬憳绛夌骇,鍋氳繃鐨勯」鐩�,鎷ユ湁鐨勬爣绛�,浼氬憳鍒涘缓鏃堕棿,鏈�鍚庝竴娆℃秷璐规椂闂�,鏈�鍚庝竴娆″埌搴楁椂闂�)
+     * 鑾峰彇浜虹兢鍖呭垪琛�(鍙紶绛涢�夌殑鍙傛暟:浼氬憳绛夌骇,鍋氳繃鐨勯」鐩�,浼氬憳鍒涘缓鏃堕棿,鏈�鍚庝竴娆℃秷璐规椂闂�,鏈�鍚庝竴娆″埌搴楁椂闂�)
      * */
     @PostMapping(value = "/user/package/list")
     Result userPackageList(@RequestBody UserPackageDto userPackageDto);

--
Gitblit v1.8.0