nieziyan 7af7fafc86 Merge branch 'mdc' into SelfStation ... # Conflicts: # jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumServiceQuotes.java # jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/mapper/GardsNuclLibMapper.java # jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java # jeecg-module-station-operation/src/main/java/org/jeecg/DataReceivingStatusManager.java		2024-01-26 17:00:07 +08:00
..
armd-abnormal-alarm-start	fix：微服务name修改	2024-01-25 14:24:50 +08:00
armd-auto-process-start	fix：微服务name修改	2024-01-25 14:24:50 +08:00
armd-cloud-gateway	fix: 更新Docker的配置	2024-01-16 16:01:02 +08:00
armd-cloud-nacos	fix: 更新Docker的配置	2024-01-16 16:01:02 +08:00
armd-demo-cloud-start	运行生成日志自动处理增加输出控制台信息相关配置	2023-11-22 16:49:17 +08:00
armd-log-manage-start	fix：微服务name修改	2024-01-25 14:24:50 +08:00
armd-spectrum-analysis-start	Merge branch 'mdc' into SelfStation	2024-01-26 17:00:07 +08:00
armd-station-operation-start	fix：微服务name修改	2024-01-25 14:24:50 +08:00
armd-system-cloud-start	fix：微服务name修改	2024-01-25 14:24:50 +08:00
armd-web-statistics-start	fix：微服务name修改	2024-01-25 14:24:50 +08:00
jeecg-visual	gamma算法insertPeak，ComputePeakRange调整	2023-10-11 10:32:17 +08:00
docker-compose-base.yml	fix: 更新Docker的配置	2024-01-16 16:01:02 +08:00
docker-compose.yml	fix: 更新Docker的配置	2024-01-16 16:01:02 +08:00
pom.xml	fix：修改服务名称	2023-10-12 19:18:15 +08:00