Merge branch 'test_future_wangge' into 'test'

罗元桥

2021-06-05 9f78fe08ec127eb8a90d75771c4f26de4d179495

Merge branch 'test_future_wangge' into 'test'

修改bug

See merge request root/zhihuishequ!31

 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;

}