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

Compare commits

base: xiaoguangbin:b19f5087eddd4b1fd1c2720bece95cbeaa7331e3
Branches Tags
xiaoguangbin:mdc
xiaoguangbin:SelfStation
xiaoguangbin:SelfStation-pgsql
xiaoguangbin:SelfStation-testdll
xiaoguangbin:mdc-merge
xiaoguangbin:sleepDownload
xiaoguangbin:noFtp-seflStation
xiaoguangbin:noFtp
xiaoguangbin:noFtp-F
xiaoguangbin:onlyDownload
xiaoguangbin:master
..
compare: xiaoguangbin:c6ea38f2d32c38f3a7019664c72926470970049f
Branches Tags
xiaoguangbin:SelfStation
xiaoguangbin:mdc
xiaoguangbin:SelfStation-pgsql
xiaoguangbin:SelfStation-testdll
xiaoguangbin:mdc-merge
xiaoguangbin:sleepDownload
xiaoguangbin:noFtp-seflStation
xiaoguangbin:noFtp
xiaoguangbin:noFtp-F
xiaoguangbin:onlyDownload
xiaoguangbin:master

No commits in common. "b19f5087eddd4b1fd1c2720bece95cbeaa7331e3" and "c6ea38f2d32c38f3a7019664c72926470970049f" have entirely different histories.
b19f5087ed ... c6ea38f2d3

1 changed files with 6 additions and 4 deletions
Show Stats Expand all files Collapse all files

10
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java
View File

@ -446,10 +446,12 @@ public class SelfStationServiceImpl implements ISelfStationService {
roiThreePHDFile.getSetting().setRefTime_act(refTimeAct); roiThreePHDFile.getSetting().setRefTime_act(refTimeAct);
roiFourPHDFile.getSetting().setRefTime_act(refTimeAct); roiFourPHDFile.getSetting().setRefTime_act(refTimeAct);
} }
BeanUtils.copyProperties(roiOnePHDFile.getSetting(), roiOnePHDFile.getUsedSetting()); SpecSetup usedSetting = new SpecSetup();
BeanUtils.copyProperties(roiTwoPHDFile.getSetting(), roiTwoPHDFile.getUsedSetting()); BeanUtils.copyProperties(roiOnePHDFile.getSetting(), usedSetting);
BeanUtils.copyProperties(roiThreePHDFile.getSetting(), roiThreePHDFile.getUsedSetting()); roiOnePHDFile.setUsedSetting(usedSetting);
BeanUtils.copyProperties(roiFourPHDFile.getSetting(), roiFourPHDFile.getUsedSetting()); roiTwoPHDFile.setUsedSetting(usedSetting);
roiThreePHDFile.setUsedSetting(usedSetting);
roiFourPHDFile.setUsedSetting(usedSetting);
} }
@DS("ora") @DS("ora")