Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

 Conflicts:
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
	ruoyi/src/main/resources/vm/java/domain.java.vm
	ruoyi/src/main/resources/vm/vue/index.vue.vm

This commit is contained in:

疯狂的狮子li

2020-04-29 09:16:29 +08:00

parent 405ad4280c aa23ef1e99

commit 1dae7c9bc9

11 changed files with 28 additions and 23 deletions

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

+1 -1

View File

@@ -23,7 +23,7 @@ import ${import};
 /**
  * ${functionName}对象 ${tableName}
  *
  *
  * @author ${author}
  * @date ${datetime}
  */