Merge branch 'master' of http://scjoyedu.eicp.net:9121/front-team/webPublic

FormInsertDiy/AffairPage/ApplyPage/List.js

@@ -230,6 +230,7 @@ export default class List extends Component {
       loading,
       noSelectRow: !listConfig.selectRows,
       onSelectRow: this.handleSelectRows,
+      scroll: {x: true},
     };
     if (!listConfig.paging) {
       tableProps.data = { list: data, pagination: false };

FormInsertDiy/AffairPage/AuditPage/List.js

@@ -282,6 +282,7 @@ export default class List extends Component {
       loading,
       noSelectRow: !listConfig.selectRows,
       onSelectRow: this.handleSelectRows,
+      scroll: {x: true},
     };
     if(!listConfig.paging){
       tableProps.data = {list: data, pagination:false};