Code

pull#2

Code

Merged

marxangels merged 3 commits intojkvou943:masterjkvou943/vue-element-admin:masterfrom PanJiaChen:masterPanJiaChen/vue-element-admin:masterCopy head branch name to clipboardMar 17, 2019

+717-303

Commits

Commits on Mar 17, 2019

• feature[Excel]: support export merged header export (#1718)

  

  llccing

  authored and

  PanJiaChen

  committed
  763b31d

  Copy full SHA for 763b31d

• feature[Excel]: add export merge header excel demo

  PanJiaChen

  committed
  8d242a0

  Copy full SHA for 8d242a0

• chore: update eslint && lint code

  

  jerecui

  authored and

  PanJiaChen

  committed
  b8d47bd

  Copy full SHA for b8d47bd