Merge branch 'develop' of https://github.com/dibo-software/diboot-v2 into develop

2019-09-10 13:41:51 +08:00 · 2019-09-10 13:41:51 +08:00 · 0ad736d856
parent 1abb6a1c99 76ce2768ee
commit 0ad736d856
1 changed files with 2 additions and 2 deletions
--- a/diboot-core/src/main/java/com/diboot/core/entity/Dictionary.java
+++ b/diboot-core/src/main/java/com/diboot/core/entity/Dictionary.java
@ -61,13 +61,13 @@ public class Dictionary extends BaseExtEntity {
    /***
     * 是否为系统预置（预置不可删除）
     */
-    @TableField
+    @TableField("is_deletable")
    private boolean deletable = false;

    /***
     * 是否可编辑
     */
-    @TableField
+    @TableField("is_editable")
    private boolean editable = false;

    public Long getParentId() {