CeDo
2021-06-07 3d56d066ffc89c650cf49d0a9075305c2a12d83d
Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
2个文件已修改
8 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
}
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java
@@ -155,6 +155,7 @@
        }
        BeanUtils.copyProperties(photoHandleDTO,easyPhotoDO);
        easyPhotoDO.setHandleStatus(ComActEasyPhotoDO.handleStatus.yes);
        easyPhotoDO.setFeedbackAt(new Date());
        //关联随手拍类型
        if(!photoHandleDTO.getEasyTypeIds().isEmpty()){
            List<ComActEasyPhotoTypeRelationDO> typeRelationDOList = new ArrayList<>();