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

lidongdong

2022-10-08 1ac9d6d25f32148354e46d11b814c306f475ee0d

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/dao/ComPropertyAlarmDao.java

@@ -18,4 +18,5 @@
@Mapper
public interface ComPropertyAlarmDao extends BaseMapper<ComPropertyAlarm> {
    IPage<ComPropertyAlarmVO> selectList(Page page, @Param("commonPage") CommonPage commonPage);
    ComPropertyAlarmVO selectById(Integer id);
}