Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

kaiyu

2020-12-01 65007f6811e580d8660340b8216296e68fae598c

 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);
}