panbaolin
9a0f00ab29
Merge remote-tracking branch 'origin/SelfStation-pgsql' into SelfStation
# Conflicts:
# jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsDetectors.java
# jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsAlertData.java
# jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsGPSData.java
# jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsMetData.java
# jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleData.java
# jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSohData.java
# jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsAnalyses.java
# jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsAnalyses.java
# jeecg-module-auto-process/src/main/java/org/jeecg/modules/mapper/xml/GardsCalibrationMapper.xml
# jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/xml/calCulStationInfoMapper.xml
# jeecg-server-cloud/armd-cloud-gateway/src/main/resources/application.yml
# jeecg-server-cloud/armd-web-statistics-start/src/main/java/org/jeecg/JeecgWebStatisticsApplication.java