From eee1e8b17bbc314aae7d5a312065395933cc729c Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 03 九月 2024 15:58:26 +0800
Subject: [PATCH] Merge branch 'master-jiayan' into master-jiayan-test

---
 phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java                              |    2 ++
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiAppReportService.java |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiAppReportService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiAppReportService.java
index a6948c1..165c639 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiAppReportService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiAppReportService.java
@@ -77,13 +77,13 @@
     Result updateProject(@RequestBody AppointmentVisitVo appointmentVisitVo);
 
     /**
-     * 闂ㄥ簵鍗囩骇VIP锛堝惈褰撴棩鍑嗕細鍛樺崌绾э級
+     * 闂ㄥ簵鍗囩骇VIP锛堝惈褰撴棩鍑嗕細鍗囩骇锛�
      */
     @PostMapping("/report/appointment/level/upgrade")
     Result levelUpgrade(@RequestBody AppointmentVisitVo appointmentVisitVo);
 
     /**
-     * 鍗囩骇VIP锛堝惈褰撴棩鍑嗕細鍛樺崌绾э級
+     * 鍗囩骇VIP锛堝惈褰撴棩鍑嗕細鍗囩骇锛�
      */
     @PostMapping("/report/appointment/up/level")
     Result upLevel(@RequestBody AppointmentVisitVo appointmentVisitVo);
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
index 0d542e8..3ffd64a 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
@@ -26,6 +26,8 @@
     private String hisNo;
     /**鐢ㄦ埛浼氬憳绛夌骇id*/
     private String memberLevelId;
+    /**鏄惁vip*/
+    private Integer isVip = 0;
     /**鐢ㄦ埛浼氬憳绛夌骇鍚嶇О*/
     private String memberName;
     /**鐢ㄦ埛浼氬憳绛夌骇鍥炬爣*/

--
Gitblit v1.8.0