Merge branch 'master' of http://192.168.1.41:3000/SmartCost/ConstructionOperation

modules/all_models/stdGlj_glj.js

@@ -34,13 +34,13 @@ const std_glj = new Schema({
     gljType: Number,
     shortName: String,
     unit: String,
-    taxRate: Number, // 税率
+    taxRate: String, // 税率
     adjCoe: Number,
     component: [std_gljComponent],
     materialType: Number, //三材类型：钢材1、钢筋2、木材3、水泥4、标准砖5
     materialCoe: Number, //三材系数
     model: Number, //机型
-    //经济指标数据
+    //经济指标数据s
     materialIndexType:String,//工料指标类别
     materialIndexUnit:String,//工料指标单位
     materialIndexCoe:Number//单位转换系数