Merge branch 'master' of http://123.207.147.179:8888/node_server/zjxcxServer

# Conflicts:
#	serverConfig.xml

src/routers/router.ts

@@ -2,9 +2,11 @@
 import * as asyncHandler from 'express-async-handler'
 
 import * as adminRouters from './admin'
+import * as fuhuaqiRouters from './fuhuaqi'
+
 
 export function setRouter(httpServer){
     //新版本
     adminRouters.setRouter(httpServer);
-    adminRouters.setRouter(httpServer);
+    fuhuaqiRouters.setRouter(httpServer);
 }
\ No newline at end of file