Merge branch 'dev-1.1.4' into 'dev-1.1.4'

修复价格四舍五入显示问题

See merge request hurugang/thmz_system!36

src/main/resources/static/js/yf/yf_inventory_list.js

@@ -476,7 +476,7 @@ function initTable(classCode) {
                 width: 50,
                 visible: isMultiple==1?false:true,
                 formatter: function (value, row, index) {
-                    return value.toFixed(2);
+                    return value;
                 }
             }, {
                 field: 'stockAmount',
@@ -496,7 +496,7 @@ function initTable(classCode) {
                 width: 50,
                 visible: isMultiple==1?false:true,
                 formatter: function (value, row, index) {
-                    return value.toFixed(2);
+                    return value;
                 }
             }, {
                 field: 'stockAmountVirtual',