Skip to content

J
jinfa-platform
Commit 34e4adbd authored by GuanHua's avatar GuanHua
Browse files
Options

merge: routes文件冲突解决

parent 1ed59c47
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
config/routes/index.ts
View file @ 34e4adbd
...@@ -26,11 +26,7 @@ import ProcurementRoute from './procurementRoute'; ...@@ -26,11 +26,7 @@ import ProcurementRoute from './procurementRoute';
// import contracRoute from './contracRoute'; // import contracRoute from './contracRoute';
// export const routes = [CommodityRoute, MemberRoute, ShopRoute, ChannelRoute, TranactionRoute, AfterService, PayandSettleRoute, LogisticsRoute, AuthConfigRoute, HandlingRoute, BalaceRoute] // 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' const isDev = process.env.NODE_ENV === 'development'
>>>>>>> 8fe7b71dc6628a1970f3f999821c86a7edf0fc53
const homeRoute = { const homeRoute = {
path: `/memberCenter/home`, path: `/memberCenter/home`,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment