浏览代码

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

MaiXinRong 8 年之前
父节点
当前提交
ba0a2b5870
共有 4 个文件被更改,包括 7 次插入7 次删除
  1. 1 1
      modules/main/models/GLJ.js
  2. 1 1
      modules/main/models/projectGLJ.js
  3. 1 1
      modules/main/models/ration.js
  4. 4 4
      test/tmp_data/test_project_1.js

+ 1 - 1
modules/main/models/GLJ.js

@@ -7,7 +7,7 @@ var Schema = mongoose.Schema;
 
 var GLJSchema = new Schema({
     ID: Number,
-    ProjectID: Number,
+    projectID: Number,
     orgRQuantity: String, //Decimal
     rQuantity: String, //Decimal
     customQuantity: String, //Decimal

+ 1 - 1
modules/main/models/projectGLJ.js

@@ -7,7 +7,7 @@ var Schema = mongoose.Schema;
 
 var projectGLJSchema = new Schema({
     ID: Number,
-    projectId: Number,
+    projectID: Number,
     code: Number,
     name: String,
     specs: String,

+ 1 - 1
modules/main/models/ration.js

@@ -8,7 +8,7 @@ var Schema = mongoose.Schema;
 
 var rationSchema = new Schema({
     ID: Number,
-    ProjectID: Number,
+    projectID: Number,
     billsItemID: Number,
     serialNo: Number,
     libID: Number,

文件差异内容过多而无法显示
+ 4 - 4
test/tmp_data/test_project_1.js