bugs

web/over_write/js/zhejiang_2005.js

@@ -39,10 +39,6 @@ function overwriteRationCalcBases (taxType){
     ];
 })();
 
-<<<<<<< HEAD
-if(typeof gljUtil !== 'undefined'){
-    gljUtil.getCodeSortMath = getCodeSortMath
-=======
 // 清单基数，工程量清单的基数没有变化，只修改预算的
 if (typeof baseFigureMap !== 'undefined' && baseFigureMap.budget) {
     baseFigureMap.budget = {
@@ -140,10 +136,12 @@ if (typeof baseFigureTemplate !== 'undefined' && baseFigureTemplate.budget) {
             return (baseFee * (Math.pow(1 + costGrowthRate, growthPeriod - 1) - 1)).toDecimal(decimalObj.bills.totalPrice);
         }
     };
->>>>>>> 80e8fe33e0df952bcebe60ae109f467c547f0ad5
 }
 
 
+if(typeof gljUtil !== 'undefined'){
+    gljUtil.getCodeSortMath = getCodeSortMath
+}
 
 
 if(typeof module !== 'undefined'){
@@ -160,7 +158,7 @@ if(typeof module !== 'undefined'){
                 let str = type + "";
                 return parseInt(str.substr(0,1));
             }
-         }
+        }
     };
 }