diff --git a/ruoyi-generator/src/test/resources/application.yml b/ruoyi-generator/src/test/resources/application.yml index 2e152f0..0e1221c 100644 --- a/ruoyi-generator/src/test/resources/application.yml +++ b/ruoyi-generator/src/test/resources/application.yml @@ -67,7 +67,6 @@ gen: "convert.java.vm": "${backPath}/${serviceModule}/${MAIN_JAVA}/${packageName}/convert/${ClassName}Convert.java" "example.java.vm": "${backPath}/${serviceModule}/${MAIN_JAVA}/${packageName}/pojo/example/${ClassName}Example.java" "query.java.vm": "${backPath}/${serviceModule}/${MAIN_JAVA}/${packageName}/pojo/query/${ClassName}Query.java" - "dto.java.vm": "${backPath}/${serviceModule}/${MAIN_JAVA}/${packageName}/pojo/dto/${ClassName}DTO.java" "vo.java.vm": "${backPath}/${serviceModule}/${MAIN_JAVA}/${packageName}/pojo/vo/${ClassName}VO.java" "domain.java.vm": "${backPath}/${apiModule}/${MAIN_JAVA}/${packageName}/domain/${ClassName}.java" "mapper.xml.vm": "${backPath}/${serviceModule}/${MAIN_RESOURCES}/mapper/${moduleName}/${ClassName}Mapper.xml" @@ -84,7 +83,6 @@ gen: - vm2/java/mapper.java.vm - vm2/java/convert.java.vm - vm2/java/query.java.vm - - vm2/java/dto.java.vm - vm2/java/vo.java.vm - vm2/java/domain.java.vm - vm2/xml/mapper.xml.vm diff --git a/ruoyi-generator/src/test/resources/vm2/java/convert.java.vm b/ruoyi-generator/src/test/resources/vm2/java/convert.java.vm index 2d420b9..0640a34 100644 --- a/ruoyi-generator/src/test/resources/vm2/java/convert.java.vm +++ b/ruoyi-generator/src/test/resources/vm2/java/convert.java.vm @@ -2,7 +2,6 @@ package ${fullPackage}; import org.mapstruct.Mapper; import ${_fullClass.domain}; -import ${_fullClass.dto}; import ${_fullClass.vo}; import java.util.List; /** @@ -13,17 +12,5 @@ import java.util.List; @Mapper(componentModel = "spring"#if($table.sub), uses = ${subClassName}Convert.class#end) public interface ${ClassName}Convert { - /** - * @param source DO - * @return DTO - */ - ${ClassName}DTO do2dto(${ClassName} source); - - /** - * @param source DTO - * @return DO - */ - ${ClassName} dto2do(${ClassName}DTO source); - List<${_className.vo}> dos2vos(List<${_className.domain}> list); } diff --git a/ruoyi-generator/src/test/resources/vm2/java/dto.java.vm b/ruoyi-generator/src/test/resources/vm2/java/dto.java.vm deleted file mode 100644 index bba80d8..0000000 --- a/ruoyi-generator/src/test/resources/vm2/java/dto.java.vm +++ /dev/null @@ -1,25 +0,0 @@ -package ${fullPackage}; - -#foreach ($import in $importList) -import ${import}; -#end -#if( ${table.audit} == 1 ) -import ${env.baseAudit}; -#end -import lombok.Data; -/** - * ${functionName} DTO 对象 - * - * @author ${author} - */ -@Data -public class ${ClassName}DTO#if( ${table.audit} == 1 ) extends BaseAudit#end { -#foreach ($column in $columns) -#if(!$table.isSuperColumn($column.javaField) and $column.javaField != "delFlag") - private $column.javaType $column.javaField; -#end -#end -#if($table.sub) - private List<${subClassName}DTO> ${subclassName}List; -#end -}