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

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.model.form;
 
+import cn.estsh.i3plus.pojo.form.bean.BfButton;
 import cn.estsh.i3plus.pojo.form.bean.BfLayout;
 import cn.estsh.i3plus.pojo.form.bean.BfMethod;
 import cn.estsh.i3plus.pojo.form.bean.BfMethodDetail;
@@ -33,6 +34,18 @@ public class FormModel {
     @ApiParam(value = "功能布局")
     private BfLayout layout;
 
+    // 表单功能按钮
+    @ApiParam(value = "表单功能按钮")
+    private List<BfButton> formButtonList;
+
+    // 表单功能明细按钮
+    @ApiParam(value = "表单功能明细按钮")
+    private List<BfButton> methodDetailButtonList;
+
+    // 元素功能按钮
+    @ApiParam(value = "元素功能按钮")
+    private List<BfButton> elementButtonList;
+
     // 功能明细
     @ApiParam(value = "功能明细")
     private List<BfMethodDetail> methodDetailList;
@@ -40,4 +53,5 @@ public class FormModel {
     // 元素
     @ApiParam(value = "元素Model")
     private List<ElementModel> elementModelList;
+
 }