diff --git a/doc/5.2-patch.sql b/doc/5.2-patch.sql
index 0b2c5589..dad6d918 100644
--- a/doc/5.2-patch.sql
+++ b/doc/5.2-patch.sql
@@ -46,6 +46,8 @@ ALTER TABLE `cms_content`
CHANGE COLUMN `content_category_id` `category_id` bigint(20) UNSIGNED NULL COMMENT '所属栏目' AFTER `id`;
ALTER TABLE `cms_content`
ADD CONSTRAINT `fk_category_id` FOREIGN KEY (`category_id`) REFERENCES `cms_category` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION;
+ALTER TABLE `cms_content`
+DROP COLUMN `app_id`;
ALTER TABLE `cms_category`
MODIFY COLUMN `category_id` bigint(20) NULL DEFAULT NULL COMMENT '所属栏目' AFTER `id`;
@@ -53,6 +55,16 @@ ALTER TABLE `cms_category`
DROP COLUMN `category_manager_id`;
ALTER TABLE `cms_category`
DROP COLUMN `app_id`;
+ALTER TABLE `cms_category`
+MODIFY COLUMN `category_id` bigint(20) ZEROFILL NULL DEFAULT NULL COMMENT '所属栏目' AFTER `id`,
+MODIFY COLUMN `mdiy_model_id` int(11) NULL DEFAULT NULL COMMENT '栏目管理的内容模型id' AFTER `dict_id`;
+
+ALTER TABLE `cms_category`
+MODIFY COLUMN `mdiy_model_id` int(11) NULL DEFAULT NULL COMMENT '栏目管理的内容模型id' AFTER `dict_id`;
+
+# 注意这里改了类型,原有空的数据需要set null
+ALTER TABLE `cms_category`
+MODIFY COLUMN `category_id` bigint(20) NULL DEFAULT NULL COMMENT '所属栏目' AFTER `id`;
ALTER TABLE`app`
DROP COLUMN `app_mobile_style`,
@@ -131,6 +143,11 @@ ALTER TABLE `mdiy_tag_sql` DROP FOREIGN KEY `mdiy_tag_sql_ibfk_1`;
ALTER TABLE `mdiy_tag_sql`
ADD CONSTRAINT `fk_tag_id` FOREIGN KEY (`tag_id`) REFERENCES `mdiy_tag` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION;
+ALTER TABLE `mdiy_model`
+MODIFY COLUMN `model_type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '自定义模型类型，自定义表单不用该字段' AFTER `model_name`,
+MODIFY COLUMN `model_field` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '模型字段' AFTER `create_by`,
+MODIFY COLUMN `model_custom_type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型，自定义表单：post，自定义模型：model' AFTER `model_field`;
+
ALTER TABLE `mdiy_tag_sql`
RENAME INDEX `fk_mdiy_tag_id` TO `fk_ts_tag_id`;
diff --git a/src/main/java/net/mingsoft/cms/bean/ContentBean.java b/src/main/java/net/mingsoft/cms/bean/ContentBean.java
index de821e52..750753ae 100644
--- a/src/main/java/net/mingsoft/cms/bean/ContentBean.java
+++ b/src/main/java/net/mingsoft/cms/bean/ContentBean.java
@@ -12,10 +12,10 @@ import java.util.Date;
*/
public class ContentBean extends ContentEntity {
- /**
- * 静态化地址
- */
- private String staticUrl;
+// /**
+// * 静态化地址
+// */
+// private String staticUrl;
/**
* 开始时间
@@ -37,13 +37,13 @@ public class ContentBean extends ContentEntity {
*/
private String noflag;
- public String getStaticUrl() {
- return staticUrl;
- }
-
- public void setStaticUrl(String staticUrl) {
- this.staticUrl = staticUrl;
- }
+// public String getStaticUrl() {
+// return staticUrl;
+// }
+//
+// public void setStaticUrl(String staticUrl) {
+// this.staticUrl = staticUrl;
+// }
public String getBeginTime() {
return beginTime;
diff --git a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
index 220842b3..1d195aeb 100644
--- a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
+++ b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
@@ -40,7 +40,7 @@
-
+
@@ -211,7 +211,8 @@