修改reducer

client/reducers/index.js

@@ -11,11 +11,8 @@ import errMsg from './error' //上报异常
 import commonInfo from './common' //上报异常
 import barcodeCommon from './barcodeCommon'
 import replenishInfo from './replenish'
-<<<<<<< febaa0edbf087e4a7985ae588e39fe90d72d480b
 import recoveryInfo from './recovery'
-=======
 import TokeStokeContainer from './TokeStokeContainer'
->>>>>>> 联调商品遗留和盘点
 export default combineReducers({
     troubleList,
     storeInfo,
@@ -29,11 +26,8 @@ export default combineReducers({
     commonInfo,
     barcodeCommon,
     replenishInfo,
-<<<<<<< febaa0edbf087e4a7985ae588e39fe90d72d480b
-    recoveryInfo
-=======
+    recoveryInfo,
     TokeStokeContainer
->>>>>>> 联调商品遗留和盘点
 })