Browse Source

Merge remote-tracking branch 'origin/feature-v4-20220801' into feature-v4-20220801

# Conflicts:
#	4dkankan-utils-model/src/main/java/com/fdkankan/model/utils/CreateObjUtil.java
dengsixing 3 years ago
parent
commit
e5b2fb2bc9

+ 3 - 12
4dkankan-utils-model/src/main/java/com/fdkankan/model/utils/CreateObjUtil.java

@@ -8,18 +8,9 @@ import com.fdkankan.model.proto.Common;
 import com.fdkankan.model.proto.Visionmodeldata;
 import com.fdkankan.model.proto.format.JsonFormat;
 import com.google.protobuf.TextFormat;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.StringWriter;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.*;
 import java.util.HashMap;
 import java.util.Map;
 import lombok.extern.slf4j.Slf4j;