master
周文涛 2 years ago
parent 4fed89cec6
commit 183da52b70

@ -4,10 +4,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic; 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.annotation.Excel;
import com.enjoy.common.core.utils.iqc.ExcelImport; 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 com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -31,8 +30,9 @@ import java.util.Date;
@TableName("${tableName}") @TableName("${tableName}")
public class ${entityName} extends BaseEntity{ public class ${entityName} extends BaseEntity{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
<#list originalColumns as po> <#list originalColumns as po>
/**${po.filedComment}*/ <#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> <#if po.fieldName == primaryKeyField>
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
<#else> <#else>
@ -63,5 +63,7 @@ public class ${entityName} extends BaseEntity{
@TableLogic @TableLogic
</#if> </#if>
private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType}</#if> ${po.fieldName}; private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType}</#if> ${po.fieldName};
</#list> </#if>
</#list>
} }

@ -2,7 +2,6 @@ package ${bussiPackage}.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import lombok.*; import lombok.*;
import lombok.experimental.Accessors;
import ${bussiPackage}.${entityPackage}.${entityName}; import ${bussiPackage}.${entityPackage}.${entityName};
/** /**

@ -2,7 +2,6 @@ package ${bussiPackage}.vo;
import com.enjoy.common.core.annotation.Excel; import com.enjoy.common.core.annotation.Excel;
import com.enjoy.common.core.utils.iqc.ExcelImport; 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.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

Loading…
Cancel
Save