merge: routes文件冲突解决

config/routes/index.ts

@@ -26,11 +26,7 @@ import ProcurementRoute from './procurementRoute';
 // import contracRoute from './contracRoute';
 // export const routes = [CommodityRoute, MemberRoute, ShopRoute, ChannelRoute, TranactionRoute, AfterService, PayandSettleRoute, LogisticsRoute, AuthConfigRoute, HandlingRoute, BalaceRoute]
 
-<<<<<<< HEAD
-const isDev = true
-=======
 const isDev = process.env.NODE_ENV === 'development'
->>>>>>> 8fe7b71dc6628a1970f3f999821c86a7edf0fc53
 
 const homeRoute = {
   path: `/memberCenter/home`,