Merge remote-tracking branch 'origin/master'

aijinhui

2023-08-31 6e54b432ab969eccb47b0aa388b95bf14e398790

 ard-work/src/main/java/com/ruoyi/alarmpoints/wall/domain/ArdWall.java

File was renamed from ard-work/src/main/java/com/ruoyi/alarmpoints/elecwall/domain/ArdWall.java
@@ -1,4 +1,4 @@
package com.ruoyi.alarmpoints.elecwall.domain;
package com.ruoyi.alarmpoints.wall.domain;

import com.ruoyi.common.core.domain.entity.SysUser;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -39,7 +39,7 @@

    /** 所属部门 */
    @Excel(name = "所属部门")
    private Integer deptId;
    private Long deptId;

    /** 所属用户 */
    @Excel(name = "所属用户")
@@ -101,12 +101,12 @@
    {
        return color;
    }
    public void setDeptId(Integer deptId) 
    public void setDeptId(Long deptId)
    {
        this.deptId = deptId;
    }

    public Integer getDeptId() 
    public Long getDeptId()
    {
        return deptId;
    }