From 66e4211cbfa154a87390b25c93b32d722e0d690c Mon Sep 17 00:00:00 2001
From: xiang <5914123@qq.com>
Date: 星期四, 14 九月 2023 15:22:37 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into haucheng_panzhihua

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
index 7430e2b..bcc1f03 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
@@ -236,6 +236,11 @@
     @ApiModelProperty("区域划分")
     private String areaName;
 
+    @ApiModelProperty("爱心积分")
+    private String loveIntegral;
+    @ApiModelProperty("爱心积分密码")
+    private String playPwd;
+
     @ApiModelProperty("是否单位管理员 1是 0否")
     private Integer isCheckUnitAdmin;
 
@@ -270,4 +275,8 @@
 
     @ApiModelProperty("商家id")
     private Long storeIdId;
+
+    @ApiModelProperty("角色id")
+    private String roleId;
+
 }

--
Gitblit v1.7.1