Merge branch 'test' into 'test_bak'

罗元桥

2021-09-27 5f349fe34e3e33625f8593ec1b616f0c4528a12c

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