Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

lin

2023-02-01 44b250eed29fab7959d18015c27b96da3e4beb47

 src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java

@@ -1,7 +1,7 @@
package com.genersoft.iot.vmp.gb28181.utils;



import com.alibaba.fastjson.JSONArray;

import com.alibaba.fastjson.JSONObject;

import com.alibaba.fastjson2.JSONArray;

import com.alibaba.fastjson2.JSONObject;

import com.genersoft.iot.vmp.gb28181.bean.Device;

import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;

import com.genersoft.iot.vmp.gb28181.bean.TreeType;