Merge branch 'master_dev' into 'master'

fix: 从info中获取PTZType失败

See merge request yunteng/thingskit!413

@@ -533,7 +533,7 @@ public class TKXmlUtil {
             String ptzTypeFromInfo = TKXmlUtil.getText(info, "PTZType");
             String ptzTypeFromInfo = TKXmlUtil.getText(info, "PTZType");
             if (!ObjectUtils.isEmpty(ptzTypeFromInfo)) {
             if (!ObjectUtils.isEmpty(ptzTypeFromInfo)) {
               try {
               try {
-                deviceChannel.setPTZType(Integer.parseInt(ptzType));
+                deviceChannel.setPTZType(Integer.parseInt(ptzTypeFromInfo));
               } catch (NumberFormatException e) {
               } catch (NumberFormatException e) {
                 log.warn("[xml解析] 从通道数据info中获取PTZType失败： {}", ptzTypeFromInfo);
                 log.warn("[xml解析] 从通道数据info中获取PTZType失败： {}", ptzTypeFromInfo);
               }
               }