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

Conflicts:
	modules/main/facade/ration_installation_facade.js

modules/main/controllers/bills_controller.js

@@ -10,7 +10,7 @@ let quantity_detail = require("../facade/quantity_detail_facade");
 let bill_detail = require("../facade/bill_facade");
 let ration_glj = mongoose.model('ration_glj');
 let ration_coe = mongoose.model('ration_coe');
-import rationInstallationModel from "../models/ration_installation";
+let rationInstallationModel = mongoose.model('ration_installation');
 //统一回调函数
 var callback = function(req, res, err, message, data){
     res.json({error: err, message: message, data: data});

modules/main/facade/ration_installation_facade.js

@@ -2,8 +2,7 @@
  * Created by zhang on 2018/2/24.
  */
 let mongoose = require('mongoose');
-let rationInstallationModel =  mongoose.model('ration_installation');
-let consts = require('../models/project_consts');
+let rationInstallationModel = mongoose.model('ration_installation');let consts = require('../models/project_consts');
 let projectConsts = consts.projectConst;
 
 module.exports={