xoi

build/utils.js

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