Merge remote-tracking branch 'origin/test' into test

manailin

2021-09-13 d858e8b9866f72a48cce05373191b4fa827d2944

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/ComPropertyAlarmSettingService.java

@@ -14,4 +14,5 @@
public interface ComPropertyAlarmSettingService extends IService<ComPropertyAlarmSetting> {
    R pageList(CommonPage commonPage);
    R getByCommunityId(Long communityId);
    R insert(ComPropertyAlarmSetting comPropertyAlarmSetting);
}