Merge remote-tracking branch 'origin/master'

aijinhui

2023-08-31 a152548db005be9227730a3166dc233d94a52c5f

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

@@ -1,9 +1,12 @@
package com.ruoyi.alarmpoints.elecwall.domain;

import com.ruoyi.common.core.domain.entity.SysUser;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;

import java.util.List;

/**
 * 电子围栏管理对象 ard_wall
@@ -41,8 +44,19 @@
    /** 所属用户 */
    @Excel(name = "所属用户")
    private String userId;
    /** 关联用户列表 */
    @Excel(name = "关联用户列表")
    List<SysUser> sysUserList;

    public void setId(String id) 
    public List<SysUser> getSysUserList() {
        return sysUserList;
    }

    public void setSysUserList(List<SysUser> sysUserList) {
        this.sysUserList = sysUserList;
    }

    public void setId(String id)
    {
        this.id = id;
    }