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

src/main/java/com/chinaunicom/mall/ebtp/extend/blockchain/entity/BlockChainLog.java

@@ -7,6 +7,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
 import java.io.Serializable;
 
 /**
@@ -76,6 +78,4 @@ public class BlockChainLog implements Serializable {
         @ApiModelProperty(value = "0-成功 1-失败")
         private Integer status;
 
-
-
 }