Commit b0481d49 authored by 李驰骋's avatar 李驰骋

Merge remote-tracking branch 'origin/dev' into dev

parents fb4629fe 5ba3503c
......@@ -24,8 +24,8 @@
return {
tableData: [],
tableSelectData: [],
userName: null,
nickName: null,
userName: null,
tableColumn: [{
type: 'selection',
width: 35
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment