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

device-api-service-merc-mini/src/main/java/com/xy/controller/MercMiniDeviceEventController.java

@@ -45,7 +45,7 @@ public class MercMiniDeviceEventController {
         PageBean<DeviceEventMsgDto.Vo> voPageBean = new PageBean<>();
         Long mercId = MercAuthUtils.getMercId();
         page.setMercId(mercId);
-        ArrayList<String> deviceCodes = CollUtil.newArrayList("D01", "M01");
+        ArrayList<String> deviceCodes = CollUtil.newArrayList("D01", "M01", "AISHJ");
         Map<String, SysCodeConfigureRedis> deviceCodeMap = MapUtil.newHashMap();
         deviceCodes.forEach(code -> {
             Map<String, SysCodeConfigureRedis> childrenByParentCode = SysCodeConfigureUtils.getChildrenByParentCode(code);