Merge branch 'master' into test

device-api-service/src/main/java/com/xy/service/DeviceEventMsgServiceImpl.java

@@ -68,6 +68,7 @@ public class DeviceEventMsgServiceImpl extends ServiceImpl<DeviceEventMsgMapper,
                 .ge(DeviceEventMsg::getCreateTime, page.getBeginCreateTime())
                 .le(DeviceEventMsg::getCreateTime, page.getEndCreateTime())
                 .in(DeviceEventMsg::getCode, codes)
+                .like(DeviceEventMsg::getMsg)
                 .build()
                 .orderByDesc(!Emptys.check(pageBean.getOrders()), DeviceEventMsg::getId);
         IPage<DeviceEventMsg> iPage = page(toIPage(pageBean), lambdaQueryWrapper);
@@ -100,6 +101,7 @@ public class DeviceEventMsgServiceImpl extends ServiceImpl<DeviceEventMsgMapper,
                 .in(DeviceEventMsg::getId, selectList.getIds())
                 .in(DeviceEventMsg::getDeviceId, selectList.getDeviceIds())
                 .in(DeviceEventMsg::getCode, codes)
+                .like(DeviceEventMsg::getMsg)
                 .build();
         List<DeviceEventMsg> list = list(lambdaQueryWrapper);
         List<DeviceEventMsgDto.Vo> vos = copy(DeviceEventMsgDto.Vo.class, list);