Merge remote-tracking branch 'origin/master'

src/main/resources/static/assets/js/project_common.js

@@ -33,10 +33,10 @@ function f2(x) {
  * @returns {string}
  */
 function f2Fixed(f) {
-    //return Number(f).toFixed(2);
+    return Number(f).toFixed(2);
 
-    //格式化413,423,423.24
-    return f.toLocaleString('zh',{minimumFractionDigits: 2, maximumFractionDigits: 2, useGrouping: true});
+    //格式化413,423,423.24，数字类型的输入框填入这样的有问题
+    //return Number(f).toLocaleString('zh',{minimumFractionDigits: 2, maximumFractionDigits: 2, useGrouping: true});
 }