From 1062da678f144a860cab22f586253d6d744e9069 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 25 四月 2020 20:14:40 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-ui/src/views/tool/gen/index.vue | 2 +-
ruoyi/src/main/resources/vm/java/domain.java.vm | 3 ---
ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java | 1 +
ruoyi/src/main/resources/vm/vue/index.vue.vm | 2 +-
ruoyi/src/main/resources/vm/vue/index-tree.vue.vm | 2 +-
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java | 3 ++-
ruoyi-ui/src/assets/styles/ruoyi.scss | 4 ++--
7 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss
index c78051f..0c2919b 100644
--- a/ruoyi-ui/src/assets/styles/ruoyi.scss
+++ b/ruoyi-ui/src/assets/styles/ruoyi.scss
@@ -138,7 +138,7 @@
padding-left: 15px;
margin-bottom: 10px;
}
-
+
/* text color */
.text-navy {
color: #1ab394;
@@ -194,4 +194,4 @@
opacity: .8;
color: #fff!important;
background: #42b983!important;
-}
\ No newline at end of file
+}
diff --git a/ruoyi-ui/src/views/tool/gen/index.vue b/ruoyi-ui/src/views/tool/gen/index.vue
index 233e156..c026329 100644
--- a/ruoyi-ui/src/views/tool/gen/index.vue
+++ b/ruoyi-ui/src/views/tool/gen/index.vue
@@ -288,4 +288,4 @@
}
}
};
-</script>
\ No newline at end of file
+</script>
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
index 45898d7..6501949 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
@@ -11,6 +11,7 @@
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
import com.ruoyi.project.system.domain.SysRole;
import com.ruoyi.project.system.domain.SysRoleDept;
@@ -82,7 +83,7 @@
*/
public List<SysRole> selectRoleAll()
{
- return roleMapper.selectRoleAll();
+ return SpringUtils.getAopProxy(this).selectRoleList(new SysRole());
}
/**
diff --git a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
index cd89f73..e464974 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
@@ -196,6 +196,7 @@
if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType()))
{
importList.add("java.util.Date");
+ importList.add("com.fasterxml.jackson.annotation.JsonFormat");
}
else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType()))
{
diff --git a/ruoyi/src/main/resources/vm/java/domain.java.vm b/ruoyi/src/main/resources/vm/java/domain.java.vm
index 39697b7..edf7ea5 100644
--- a/ruoyi/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi/src/main/resources/vm/java/domain.java.vm
@@ -17,9 +17,6 @@
#elseif($table.tree)
import com.ruoyi.framework.web.domain.TreeEntity;
#end
-#foreach ($import in $importList)
-import ${import};
-#end
/**
* ${functionName}瀵硅薄 ${tableName}
diff --git a/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm
index 0cbdd3b..6c33b9f 100644
--- a/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm
@@ -88,7 +88,7 @@
#elseif($column.list && $column.htmlType == "datetime")
<el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.${javaField}) }}</span>
+ <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
#elseif($column.list && "" != $column.dictType)
diff --git a/ruoyi/src/main/resources/vm/vue/index.vue.vm b/ruoyi/src/main/resources/vm/vue/index.vue.vm
index dcb5527..0d2ca8c 100644
--- a/ruoyi/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi/src/main/resources/vm/vue/index.vue.vm
@@ -112,7 +112,7 @@
#elseif($column.list && $column.htmlType == "datetime")
<el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.${javaField}) }}</span>
+ <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
#elseif($column.list && "" != $column.dictType)
--
Gitblit v1.9.3