Merge remote-tracking branch 'origin/master'

疯狂的狮子li

2020-04-29 42008124b68bfd7f2e2003c07bc0bdd5311f95b6

 ruoyi/src/main/resources/vm/java/domain.java.vm

@@ -17,13 +17,10 @@
#elseif($table.tree)
import com.ruoyi.framework.web.domain.TreeEntity;
#end
#foreach ($import in $importList)
import ${import};
#end

/**
 * ${functionName}对象 ${tableName}
 *
 * 
 * @author ${author}
 * @date ${datetime}
 */