Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java

@@ -274,7 +274,8 @@ public class BlockSoftSwitchEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum VERIFICATION_METHOD{
-        IMPP_LOGIN(1,"IMPP登录");
+        IMPP_LOGIN(1,"IMPP登录"),
+        WEBSERVICE_AUTH(2,"webService认证");
 
         private int value;
         private String description;

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java

@@ -97,6 +97,10 @@ public class BfMenu extends BaseBean {
     @ApiParam(value = "菜单状态")
     private Integer menuStatus;
 
+    @Column(name = "SYS_MENU_ID")
+    @ApiParam(value = "系统菜单id")
+    private Long  sysMenuId;
+
     @Transient
     @ApiParam(value = "菜单子集")
     private List<BfMenu> bfMenuList;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/DingSendBatchRequestModel.java

@@ -28,5 +28,9 @@ public class DingSendBatchRequestModel {
     private String content;
     @ApiModelProperty(value ="项目类型(默认andon)" , access ="项目类型(默认andon)")
     private String softType = "andon";
+    @ApiModelProperty(value ="按钮名称" , access ="按钮名称")
+    private String buttonName ;
+    @ApiModelProperty(value ="按钮跳转url" , access ="按钮跳转url")
+    private String buttonUrl;
 
 }