xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：合并冲突

Browse Source
This commit is contained in:
nieziyan 2023-09-05 16:00:27 +08:00
parent 110f986fc1
commit d78267f219
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java
View File

@ -13,7 +13,7 @@ import org.jeecg.modules.base.dto.GardsNuclIdedDto;
import org.jeecg.modules.base.dto.QcCheckDto;
import org.jeecg.modules.base.entity.original.GardsSampleData;
import org.jeecg.modules.base.entity.rnauto.*;
import org.jeecg.modules.base.vo.*;
import org.jeecg.modules.entity.vo.*;
import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct;
import java.lang.reflect.Field;
import java.util.*;