ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java
This commit is contained in:
wr
2025-03-14 16:36:14 +08:00
parent d084950090 ff53c91279
commit 04bd8a7db3
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
detection/src/main/java/com/njcn/gather/result/pojo/vo/RawDataExcel.java
View File

@@ -1,7 +1,6 @@
package com.njcn.gather.result.pojo.vo; package com.njcn.gather.result.pojo.vo;
import cn.afterturn.easypoi.excel.annotation.Excel; import cn.afterturn.easypoi.excel.annotation.Excel;
import com.njcn.gather.device.pojo.vo.PqDevExcel;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;