Merge branch 'master' of http://192.168.1.12:3000/SmartCost/ConstructionCost

modules/complementary_glj_lib/models/schemas.js

@@ -40,6 +40,7 @@ let stdGljSchema = new Schema({
     gljClass: Number,
     gljType: Number,
     shortName: String,
+    unit: String,
     component: [gjlComponentSchema]
 },{versionKey: false});
 

modules/ration_repository/models/ration_item.js

@@ -35,6 +35,7 @@ var rationItemSchema = mongoose.Schema({
     rationRepId: Number,
     caption: String,
     feeType: Number,
+    jobContent: String,
     rationGljList: [rationGljItemSchema],
     rationCoeList: Array,
     rationAssList: [rationAssItemSchema]