From 3d56d066ffc89c650cf49d0a9075305c2a12d83d Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 07 六月 2021 09:13:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 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 335fa1c..abb4d9b 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
@@ -153,7 +153,6 @@
     @ApiModelProperty("0 未申请 1 申请中 2 通过 3 驳回")
     private Integer volunteerStatus;
 
-
     @ApiModelProperty("是否注册 0 否 1 是")
     private Integer isRegister;
 
@@ -169,4 +168,10 @@
     @ApiModelProperty("是否已实名")
     private Boolean  isRealNamed;
 
+    @ApiModelProperty("上班时间")
+    private Integer workStartTime;
+
+    @ApiModelProperty("下班时间")
+    private Integer workEndTime;
+
 }

--
Gitblit v1.7.1