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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/iface/IResultSetCall.java

@@ -10,6 +10,7 @@ import java.sql.SQLException;
  * @CreateDate : 2019-06-11 16:12
  * @Modify:
  **/
+@FunctionalInterface
 public interface IResultSetCall<T> {
 
     /**

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java

@@ -62,6 +62,8 @@ public class SuitCoreModel {
      */
     private BsSuitCase bsSuitCase;
 
+    private Object bsSuitCaseDetail;
+
     /**
      * 认证结果
      */

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java

@@ -10,6 +10,8 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description : socket套件
@@ -34,6 +36,5 @@ public class BsSocketSuitCase extends BaseBean {
     @Column(name = "SOCKET_MODE_ID")
     @ApiParam(value = "socket模式(枚举,服务端，客户端)")
     private Integer socketModeId;
-
 }
 

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java

@@ -51,9 +51,9 @@ public class BsSuitCaseParam extends BaseBean {
     @ApiParam(value = "参数值类型")
     private Integer paramValTypeId;
 
-    @Column(name = "PARAM_DEFAULT_VAL")
+    @Column(name = "PARAM_DEFAULT_VALUE")
     @ApiParam(value = "参数默认值")
-    private String paramDefaultVal;
+    private String paramDefaultValue;
 
     @Column(name = "PARAM_DESCRIPTION")
     @ApiParam(value = "参数描述")