Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-10-22 f0b5148973e9437f3651153e53f8f336c4c3c6ff

 src/main/java/com/moral/service/AlarmConfigService.java

@@ -8,6 +8,7 @@
public interface AlarmConfigService {
    public Optional<AlarmConfig> queryValueByOrganizationId(int organizationId);
    public Optional<AlarmConfig> queryByOrganizationId(int organizationId);
    public String getValueByOrganizationId(int organizationId);
    public Optional<AlarmConfig> queryByMonitorPointId(int mpId);
    public  AlarmConfigValue getDefaultAlarmConfigValue();

@@ -15,4 +16,5 @@

    void addOrModify(AlarmConfig alarmConfig);

    int containOrgId(Integer orgId);
}