xiaoguangbin 80985a74d7 Merge remote-tracking branch 'refs/remotes/origin/SelfStation' into noFtp-seflStation ... # Conflicts: # jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/DictConstant.java # jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailServiceManager.java # jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/CalculateConcController.java # jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/redisStream/AnalysisConsumer.java # jeecg-module-auto-process/src/main/java/org/jeecg/modules/AutoProcessManager.java # jeecg-module-auto-process/src/main/java/org/jeecg/modules/EmailParsingActuator.java # jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractSpectrumHandler.java # jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumParsingActuator.java # jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java # jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java # jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java # jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumFileServiceImpl.java # jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java # jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsSampleDataServiceImpl.java		2024-06-26 10:43:45 +08:00
..
armd-abnormal-alarm-start	feat：Application异常结束退出	2024-06-19 16:33:55 +08:00
armd-app-start	fix:解决 app 打包失败问题	2024-02-21 17:07:46 +08:00
armd-auto-process-start	feat：Application异常结束退出	2024-06-19 16:33:55 +08:00
armd-cloud-gateway	fix: 更新Docker的配置	2024-01-16 16:01:02 +08:00
armd-cloud-nacos	Merge remote-tracking branch 'origin/SelfStation' into SelfStation	2024-01-30 11:52:16 +08:00
armd-demo-cloud-start	运行生成日志自动处理增加输出控制台信息相关配置	2023-11-22 16:49:17 +08:00
armd-log-manage-start	feat：Application异常结束退出	2024-06-19 16:33:55 +08:00
armd-spectrum-analysis-start	Merge remote-tracking branch 'refs/remotes/origin/SelfStation' into noFtp-seflStation	2024-06-26 10:43:45 +08:00
armd-station-operation-start	feat：Application异常结束退出	2024-06-19 16:33:55 +08:00
armd-system-cloud-start	feat：Application异常结束退出	2024-06-19 16:33:55 +08:00
armd-web-statistics-start	feat：Application异常结束退出	2024-06-19 16:33:55 +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	新增app微服务模块	2024-02-05 09:00:24 +08:00