From ac5bf14d6b78b7074fc0f6b91d316c7bb28fa96b Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Sat, 29 Jun 2019 20:41:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=A1=A8=E5=8D=95=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E6=93=8D=E4=BD=9C=E3=80=80=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java    | 3 ++-
 .../main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java   | 4 ++--
 .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java     | 4 ----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java
index c75399c..15c744f 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java
@@ -115,7 +115,8 @@ public class DynamicEntity extends BaseBean implements Serializable {
             Method setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{val.getClass()});
             setMethod.invoke(this, val);
         } catch (NoSuchMethodException e) {
-            LOGGER.error("没有方法：{}",setMethodName,e);
+//            LOGGER.error("没有方法：{}",setMethodName,e);
+            LOGGER.error("没有方法：{}",setMethodName);
         } catch (IllegalAccessException e) {
             LOGGER.error("入参出错：{}:{}",val,val.getClass(),e);
         } catch (InvocationTargetException e) {
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java
index f4a6151..511e343 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java
@@ -56,7 +56,7 @@ public class BfElementProperty extends BaseBean {
     private String propertyTypeNameRdd;
 
     @Column(name="PROPERTY_NAME")
-    @ApiParam(value ="元素名称")
+    @ApiParam(value ="元素属性名称")
     private String propertyName;
 
     @Column(name="PROPERTY_CODE_RDD")
@@ -137,6 +137,6 @@ public class BfElementProperty extends BaseBean {
     private BfDataObjectProperty objectProperty;
 
     public Object getFormValue() {
-        return propertyFormValue == null ? propertyDefaultValue: propertyFormValue;
+        return propertyFormValue;
     }
 }
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java
index af3fb1d..6e8adc4 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java
@@ -40,10 +40,6 @@ public class SysRole extends BaseBean {
     @ApiParam(value ="资源描述")
     private String roleDescription;
 
-    @Column(name="ROLE_GRADE")
-    @ApiParam(value ="角色等级（待定）" , example ="-1")
-    private Integer roleGrade;
-
     @Column(name="MODULE_NUMBER")
     @ApiParam(value ="权限模块数量" , example ="0" , access ="权限模块数量")
     private Integer moduleNumber;