diff --git a/src/main/resources/yangliu/XXXEntity.javai b/src/main/resources/yangliu/XXXEntity.javai index 988032d..b72ae8d 100644 --- a/src/main/resources/yangliu/XXXEntity.javai +++ b/src/main/resources/yangliu/XXXEntity.javai @@ -4,10 +4,9 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableLogic; -import com.enjoy.common.core.web.domain.BaseEntity; import com.enjoy.common.core.annotation.Excel; import com.enjoy.common.core.utils.iqc.ExcelImport; -import com.enjoy.common.core.web.domain.BaseEntity; +import com.enjoy.oqc.domain.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -31,8 +30,9 @@ import java.util.Date; @TableName("${tableName}") public class ${entityName} extends BaseEntity{ private static final long serialVersionUID = 1L; - <#list originalColumns as po> - /**${po.filedComment}*/ +<#list originalColumns as po> + <#if po.fieldName == 'creatorId' || po.fieldName == 'createBy' || po.fieldName == 'createTime' || po.fieldName == 'updaterId' || po.fieldName == 'updateBy' || po.fieldName == 'updateTime' || po.fieldName == 'tenantId'><#else> + /**${po.filedComment}*/ <#if po.fieldName == primaryKeyField> @TableId(type = IdType.ASSIGN_ID) <#else> @@ -63,5 +63,7 @@ public class ${entityName} extends BaseEntity{ @TableLogic private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType} ${po.fieldName}; - + + + } diff --git a/src/main/resources/yangliu/XXXEntityDTO.javai b/src/main/resources/yangliu/XXXEntityDTO.javai index d7760ad..03805ae 100644 --- a/src/main/resources/yangliu/XXXEntityDTO.javai +++ b/src/main/resources/yangliu/XXXEntityDTO.javai @@ -2,7 +2,6 @@ package ${bussiPackage}.dto; import io.swagger.annotations.ApiModel; import lombok.*; -import lombok.experimental.Accessors; import ${bussiPackage}.${entityPackage}.${entityName}; /** diff --git a/src/main/resources/yangliu/XXXEntityVO.javai b/src/main/resources/yangliu/XXXEntityVO.javai index 50b094d..4f2cf90 100644 --- a/src/main/resources/yangliu/XXXEntityVO.javai +++ b/src/main/resources/yangliu/XXXEntityVO.javai @@ -2,7 +2,6 @@ package ${bussiPackage}.vo; import com.enjoy.common.core.annotation.Excel; import com.enjoy.common.core.utils.iqc.ExcelImport; -import com.enjoy.common.core.web.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId;