再合并

build/utils.js

@@ -16,11 +16,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 let devModules = ['all'];
-<<<<<<< HEAD
 // let devModules = ['index','sale','statisticalReport','appoint','TMS'];
-=======
-// let devModules = ['index','inward','RMS','SporadicManage']
->>>>>>> 8bb0d560d0c1617290604d13599705e945f054b1
 // let devModules = ['index','appoint','TMS'];
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;