Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost

config/gulpConfig.js

@@ -93,7 +93,7 @@ module.exports = {
         'web/building_saas/main/js/models/quantity_detail.js',
         'web/building_saas/main/js/views/glj_view_contextMenu.js',
         'web/building_saas/main/js/views/calc_program_view.js',
-        'web/building_saas/main/js/views/confirm_modal.js'
+        'web/building_saas/main/js/views/confirm_modal.js',
         'public/web/treeDataHelper.js',
         'public/web/ztree_common.js',
         'public/web/rpt_tpl_def.js',