Merge remote-tracking branch 'origin/master'

无关风月

4 天以前 baed9b68c8cb6b693d3c010f039d2c55bf242e0e

 ruoyi-system/src/main/java/com/ruoyi/system/vo/system/NotificationUserDetailVO.java

@@ -1,14 +1,13 @@
package com.ruoyi.system.vo.system;

import com.ruoyi.system.model.OaNotifationUser;
import com.ruoyi.system.model.OaNotification;
import com.ruoyi.system.model.OaNotificationUser;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel(value = "通知对象返回VO")
public class NotificationUserDetailVO extends OaNotifationUser {
public class NotificationUserDetailVO extends OaNotificationUser {

    @ApiModelProperty(value = "部门名称")
    private String deptName;