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

疯狂的狮子li

2020-04-25 1062da678f144a860cab22f586253d6d744e9069

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

 ruoyi-ui/src/assets/styles/ruoyi.scss

 ruoyi-ui/src/views/tool/gen/index.vue

 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());
    }

    /**

 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()))
            {

 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}

 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)


 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)