Merge remote-tracking branch 'origin/master'

疯狂的狮子li

2020-04-29 42008124b68bfd7f2e2003c07bc0bdd5311f95b6

 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)