Merge remote-tracking branch 'origin/master'

lyh

2 天以前 bc8cd378fd72f43e66120c540f57f630580aa093

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcAlarmInfoMapper.java

@@ -13,4 +13,5 @@
public interface MdcAlarmInfoMapper extends BaseMapper<MdcAlarmInfo> {

    MdcAlarmInfo findAlarmContent(@Param("alarmNo") String alarmNo, @Param("equipmentId") String equipmentId);

}