From 5e4ecae41d67636777545ca7cecd565c8eaeed0f Mon Sep 17 00:00:00 2001 From: jiajia Date: Wed, 27 Sep 2023 11:45:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=9D=BE=E4=B8=8B?= =?UTF-8?q?=E5=88=86=E6=94=AFext-dev---=E9=92=89=E9=92=89=E5=8F=91?= =?UTF-8?q?=E9=80=81=E6=B6=88=E6=81=AF=E5=A2=9E=E5=8A=A0=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/model/platform/DingSendBatchRequestModel.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/DingSendBatchRequestModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/DingSendBatchRequestModel.java index 2749382..cb93512 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/DingSendBatchRequestModel.java +++ b/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; } From dabf255029bd06dbd59a99ff5dabf51f9680344e Mon Sep 17 00:00:00 2001 From: administrator Date: Sat, 7 Oct 2023 18:09:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=8C=82=E8=BD=BD=E8=8F=9C=E5=8D=95=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=96=B0=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java index d6b874e..ba718a5 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java +++ b/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 bfMenuList; From 3a34532ea95a0366cc2a32f220356f1394a0ab66 Mon Sep 17 00:00:00 2001 From: jiajia Date: Fri, 27 Oct 2023 16:24:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E5=A2=9EwebService=E8=AE=A4?= =?UTF-8?q?=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 2c8e78b..2a14219 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/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;