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

Conflicts:
	modules/all_models/stdRation_coe.js

modules/all_models/compleGlj_glj.js

@@ -30,4 +30,4 @@ const comple_glj = new Schema({
     component: [comple_gljComponent]
 }, {versionKey: false});
 
-mongoose.model('complementary_glj_lib', comple_glj);
+mongoose.model('complementary_glj_lib', comple_glj, 'complementary_glj_lib');

modules/all_models/compleRation_ration.js

@@ -58,4 +58,4 @@ const compleRationSchema = new Schema({
     deleteInfo: deleteSchema
 }, {versionKey: false});
 
-mongoose.model('complementary_ration_items', compleRationSchema);
+mongoose.model('complementary_ration_items', compleRationSchema, 'complementary_ration_items');

modules/all_models/compleRation_section.js

@@ -22,4 +22,4 @@ const compleRationSectionTreeSchema = new Schema({
     deleteInfo: deleteSchema
 }, {versionKey: false});
 
-mongoose.model('complementary_ration_section_tree', compleRationSectionTreeSchema);
+mongoose.model('complementary_ration_section_tree', compleRationSectionTreeSchema, 'complementary_ration_section_tree');

modules/all_models/options.js

@@ -13,4 +13,4 @@ const optionSchema = new Schema({
     }
 }, {versionKey: false});
 
-mongoose.model('options', optionSchema);
+mongoose.model('options', optionSchema, 'options');

modules/all_models/projects.js

@@ -32,4 +32,4 @@ const ProjectSchema = new Schema({
     "changeMark":String//更新标记  feeRate:费率文件发生了改变，unitFile 单件文件发生了改变
 });
 
-mongoose.model(collectionName, ProjectSchema);
+mongoose.model(collectionName, ProjectSchema, ccollectionName);

modules/all_models/stdBills_bills.js

@@ -23,4 +23,4 @@ const stdBills_bills = new Schema({
     {versionKey: false}
 );
 
-mongoose.model('std_bills_lib_bills', stdBills_bills);
+mongoose.model('std_bills_lib_bills', stdBills_bills, 'std_bills_lib_bills');

modules/all_models/stdRation_coe.js

@@ -22,4 +22,4 @@ const coeListSchema = new Schema({
     coes: [coeSchema]
 }, {versionKey: false});
 
-mongoose.model('std_ration_lib_coe_list', coeListSchema,'std_ration_lib_coe_list');
+mongoose.model('std_ration_lib_coe_list', coeListSchema, 'std_ration_lib_coe_list');

modules/all_models/stdRation_installFeeItem.js

@@ -15,4 +15,4 @@ const installFeeItemSchema = new Schema({
     deleted: false
 }, {versionKey: false});
 
-mongoose.model('std_ration_lib_installation', installFeeItemSchema);
+mongoose.model('std_ration_lib_installation', installFeeItemSchema, 'std_ration_lib_installation');

modules/all_models/stdRation_installSection.js

@@ -26,4 +26,4 @@ const installSectionSchema = new Schema({
     deleted: false
 }, {versionKey: false});
 
-mongoose.model('std_ration_lib_installationSection', installSectionSchema);
+mongoose.model('std_ration_lib_installationSection', installSectionSchema, 'std_ration_lib_installationSection');

modules/all_models/stdRation_lib.js

@@ -13,4 +13,4 @@ const RepositoryMapSchema = new Schema({
     "deleted": Boolean
 });
 
-mongoose.model('std_ration_lib_map', RepositoryMapSchema);
+mongoose.model('std_ration_lib_map', RepositoryMapSchema, 'std_ration_lib_map');

modules/all_models/stdRation_ration.js

@@ -46,4 +46,4 @@ const rationItemSchema = new Schema({
     rationInstList: [rationInstSchema]
 });
 
-mongoose.model('std_ration_lib_ration_items', rationItemSchema);
+mongoose.model('std_ration_lib_ration_items', rationItemSchema, 'std_ration_lib_ration_items');

modules/all_models/stdRation_section.js

@@ -17,4 +17,4 @@ const rationChapterTreeSchema = new Schema({//章节树  //生成唯一id改为s
     isDeleted: Boolean
 });
 
-mongoose.model("std_ration_lib_ration_chapter_trees", rationChapterTreeSchema);
+mongoose.model("std_ration_lib_ration_chapter_trees", rationChapterTreeSchema, 'std_ration_lib_ration_chapter_trees');

modules/all_models/std_glj.js

@@ -30,4 +30,4 @@ const std_glj = new Schema({
     component: [std_gljComponent]
 },{versionKey: false});
 
-mongoose.model('std_glj_lib_gljList', std_glj);
+mongoose.model('std_glj_lib_gljList', std_glj, 'std_glj_lib_gljList');

modules/all_models/std_gljClass.js

@@ -13,4 +13,4 @@ const std_gljClass = new Schema({
     deleted: Boolean
 }, {versionKey: false});
 
-mongoose.model('std_glj_lib_gljClass', std_gljClass);
+mongoose.model('std_glj_lib_gljClass', std_gljClass, 'std_glj_lib_gljClass');

modules/all_models/tem_bills.js

@@ -33,4 +33,4 @@ const BillsTemplateSchema = {
     calcBase: String
 };
 
-mongoose.model('temp_bills', BillsTemplateSchema);
+mongoose.model('temp_bills', BillsTemplateSchema, 'temp_bills');