diff --git a/screw-core/src/main/java/cn/smallbun/screw/core/engine/velocity/VelocityTemplateEngine.java b/screw-core/src/main/java/cn/smallbun/screw/core/engine/velocity/VelocityTemplateEngine.java index 3e6a5d0..5beb4d7 100644 --- a/screw-core/src/main/java/cn/smallbun/screw/core/engine/velocity/VelocityTemplateEngine.java +++ b/screw-core/src/main/java/cn/smallbun/screw/core/engine/velocity/VelocityTemplateEngine.java @@ -95,7 +95,7 @@ public class VelocityTemplateEngine extends AbstractTemplateEngine { Template template = null; try { String templateContent = getEngineConfig().getTemplateContent(); - if (StringUtils.isBlank(templateContent)) { + if (templateContent != null) { // get template path String path = getEngineConfig().getCustomTemplate(); //如果自定义了模板 diff --git a/screw-core/src/main/java/cn/smallbun/screw/core/metadata/model/ColumnModel.java b/screw-core/src/main/java/cn/smallbun/screw/core/metadata/model/ColumnModel.java index fa0459d..8d732fe 100644 --- a/screw-core/src/main/java/cn/smallbun/screw/core/metadata/model/ColumnModel.java +++ b/screw-core/src/main/java/cn/smallbun/screw/core/metadata/model/ColumnModel.java @@ -98,4 +98,9 @@ public class ColumnModel implements Serializable { * 嵌套数据信息(用于文档数据库) */ private TableModel nestedTable; + + /** + * 是否弃用 + */ + private Boolean deprecated; } diff --git a/screw-core/src/main/java/cn/smallbun/screw/core/metadata/model/TableModel.java b/screw-core/src/main/java/cn/smallbun/screw/core/metadata/model/TableModel.java index 63c6455..834444e 100644 --- a/screw-core/src/main/java/cn/smallbun/screw/core/metadata/model/TableModel.java +++ b/screw-core/src/main/java/cn/smallbun/screw/core/metadata/model/TableModel.java @@ -44,4 +44,9 @@ public class TableModel implements Serializable { * 表列 */ private List columns; + + /** + * 是否弃用 + */ + private Boolean deprecated; }