Merge branch 'master' of 115.28.80.125:softwarefactory/vueelementtemplate

4ccfc6be · 胡小根 · d3864736 · 4733274d · 4ccfc6be
Commit 4ccfc6be authored Feb 22, 2018 by 胡小根
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

index.vue src/views/haomo/components/details/index.vue +2 -2

No files found.
--- a/src/views/haomo/components/details/index.vue
+++ b/src/views/haomo/components/details/index.vue
 <template>
  <div>
-    <!--<hm-complex-detail :schema="schema['HmUser']" :userId="userId">-->
-    <!--</hm-complex-detail>-->
+    <hm-complex-detail :schema="schema['HmUser']" :userId="userId">
+    </hm-complex-detail>
    <hm-complex-detail :schema="schema['HmUser']" :userId="userId" :columns="showUserColumns">
    </hm-complex-detail>
  </div>