diff --git a/src/main/java/net/mingsoft/cms/entity/CategoryEntity.java b/src/main/java/net/mingsoft/cms/entity/CategoryEntity.java
index 55ee8b95..33a06887 100755
--- a/src/main/java/net/mingsoft/cms/entity/CategoryEntity.java
+++ b/src/main/java/net/mingsoft/cms/entity/CategoryEntity.java
@@ -24,9 +24,7 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import net.mingsoft.base.entity.BaseEntity;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -45,6 +43,20 @@ public class CategoryEntity extends BaseEntity {
 
     private static final long serialVersionUID = 1574925152750L;
 
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    @Override
+    public String getId() {
+        return id;
+    }
+
+    @Override
+    public void setId(String id) {
+        this.id = id;
+    }
+
     /**
      * 栏目管理名称
      */
diff --git a/src/main/java/net/mingsoft/cms/entity/ContentEntity.java b/src/main/java/net/mingsoft/cms/entity/ContentEntity.java
index af28a90a..cc28430e 100755
--- a/src/main/java/net/mingsoft/cms/entity/ContentEntity.java
+++ b/src/main/java/net/mingsoft/cms/entity/ContentEntity.java
@@ -21,7 +21,9 @@
 package net.mingsoft.cms.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import net.mingsoft.base.entity.BaseEntity;
@@ -40,6 +42,18 @@ public class ContentEntity extends BaseEntity {
 
 private static final long serialVersionUID = 1574925152617L;
 
+	@TableId(type = IdType.ASSIGN_ID)
+	private String id;
+
+	@Override
+	public String getId() {
+		return id;
+	}
+
+	@Override
+	public void setId(String id) {
+		this.id = id;
+	}
 	/**
 	* 文章标题
 	*/
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ab754fd2..6b03f7c4 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -92,7 +92,9 @@ spring:
 mybatis-plus:
   global-config:
     db-config:
-      column-format: "\"%s\""
-      id-type: assign_id
+#      column-format: "\"%s\""
+      id-type: auto
   configuration:
-    database-id: oracle
\ No newline at end of file
+    database-id: oracle
+    cache-enabled: true
+    jdbc-type-for-null: 'null' #注意：单引号