Merge branch 'master' of http://192.168.1.41:3000/caipin/cld2_react

src/product/lock_store/index.js

@@ -186,8 +186,8 @@ const mapStateToProps = (state) => {
 
     return {
       lockStore:state.getIn(['lockstore', 'lockStore']),
-      columns: state.getIn(['client', 'columns']),
-      columnsData: state.getIn(['client', 'columnsData']),
+      columns: state.getIn(['lockstore', 'columns']),
+      columnsData: state.getIn(['lockstore', 'columnsData']),
       menu: state.getIn(['submenu', 'menu']),
       list: state.getIn(['submenu', 'list']),
       inputValue: state.getIn(['submenu', 'inputValue']),