解决冲突

细节优化
自定义表单功能管理 添加 是否设计字段

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoDynamicFormController.java

@@ -2,7 +2,6 @@ package cn.estsh.i3plus.core.apiservice.controller;
 
 import cn.estsh.i3plus.icloud.form.sdk.IFormDynamicFormCloud;
 import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
-import cn.estsh.i3plus.pojo.base.dynamic.DynamicEntity;
 import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
 import cn.estsh.i3plus.pojo.form.bean.BfDataObject;
 import cn.estsh.i3plus.pojo.form.bean.BfDataObjectProperty;
@@ -17,10 +16,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import sun.swing.BakedArrayList;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;