Merge remote-tracking branch 'origin/master'

aijinhui

2023-08-31 6e54b432ab969eccb47b0aa388b95bf14e398790

 ard-work/src/main/java/com/ruoyi/alarmpoints/wall/service/impl/ArdWallServiceImpl.java

文件名从 ard-work/src/main/java/com/ruoyi/alarmpoints/elecwall/service/impl/ArdWallServiceImpl.java 修改
@@ -1,20 +1,18 @@
package com.ruoyi.alarmpoints.elecwall.service.impl;
package com.ruoyi.alarmpoints.wall.service.impl;

import java.util.ArrayList;
import java.util.List;

import com.ruoyi.alarmpoints.elecwall.domain.ArdWallUser;
import com.ruoyi.alarmpoints.wall.domain.ArdWallUser;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.dispatch.domain.ArdDispatchPolice;
import com.ruoyi.dispatch.domain.ArdDispatchPoliceUser;
import org.springframework.stereotype.Service;
import com.ruoyi.alarmpoints.elecwall.mapper.ArdWallMapper;
import com.ruoyi.alarmpoints.elecwall.domain.ArdWall;
import com.ruoyi.alarmpoints.elecwall.service.IArdWallService;
import com.ruoyi.alarmpoints.wall.mapper.ArdWallMapper;
import com.ruoyi.alarmpoints.wall.domain.ArdWall;
import com.ruoyi.alarmpoints.wall.service.IArdWallService;

import javax.annotation.Resource;