Merge remote-tracking branch 'origin/master'

mitao

3 天以前 325c6107782d4a2284bb24be688e7a87462dc202

 ruoyi-system/src/main/java/com/ruoyi/system/model/OaNotification.java

@@ -64,5 +64,10 @@
    @TableField("disabled")
    private Boolean disabled;


    @ApiModelProperty(value = "通知部门ids 逗号拼接")
    @TableField("dept_ids")
    private String deptIds;
    @ApiModelProperty(value = "指定人员ids 逗号拼接")
    @TableField(exist = false)
    private String userIds;
}