jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	ruoyi-ui/src/assets/styles/ruoyi.scss
#	ruoyi-ui/src/views/tool/gen/index.vue
This commit is contained in:
疯狂的狮子li
2020-04-29 09:17:17 +08:00
parent 1dae7c9bc9 1062da678f
commit 42008124b6
23 changed files with 41 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi/src/main/resources/vm/java/domain.java.vm
View File

@ -17,9 +17,6 @@ import com.ruoyi.framework.web.domain.BaseEntity;
#elseif($table.tree)
import com.ruoyi.framework.web.domain.TreeEntity;
#end
#foreach ($import in $importList)
import ${import};
#end
/**
* ${functionName}对象 ${tableName}