Merge branch 'master' into bms

king

2021-01-05 4de5be49a7d128118def405c5ce24771526cc188

 src/tabviews/custom/components/card/data-card/index.jsx

@@ -360,7 +360,6 @@
            columns={config.columns}
            selectedData={selectedData}
            refreshdata={this.refreshbyaction}
            getexceloutparam={this.getexceloutparam}
          /> : null
        }
        <div className={`data-zoom ${config.wrap.cardType || ''} ${config.wrap.scale || ''}`}>