Merge branch 'master' into 重构/1078

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/bean/InviteErrorCode.java
#	src/main/resources/application.yml

src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Component;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.net.ConnectException;
 import java.net.SocketTimeoutException;
 import java.util.HashMap;
@@ -442,8 +443,10 @@ public class ZLMRESTfulUtils {
         param.put("vhost", "__defaultVhost__");
         param.put("app", app);
         param.put("stream", stream);
-        param.put("stamp", stamp);
+        BigDecimal bigDecimal = new BigDecimal(stamp);
+        param.put("stamp", bigDecimal);
         param.put("schema", schema);
+        System.out.println(bigDecimal);
         return sendPost(mediaServer, "seekRecordStamp",param, null);
     }
 }