Merge remote-tracking branch 'origin/master'

艾金辉

2023-07-21 214ebdf7db3f56fce7826abe0f286326246125f6

 ard-work/src/main/java/com/ruoyi/alarm/tube/domain/ArdAlarmTube.java

文件名从 ard-work/src/main/java/com/ruoyi/alarm/tubeAlarm/domain/ArdAlarmTube.java 修改
@@ -1,12 +1,10 @@
package com.ruoyi.alarm.tubeAlarm.domain;
package com.ruoyi.alarm.tube.domain;

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.ToString;
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;