Merge branch 'dev-1.1.4' of https://172.16.32.165/hurugang/thmz_system into dev-1.1.4

src/main/resources/static/js/yk/drug_storage.js

@@ -768,7 +768,7 @@ function setPrintHtml() {
             html += '<td class="xtd" style="text-align: center;">' + data['chargeCode'] + '</td>';
             html += '<td class="xtd" style="text-align: left;">' + data['drugName'] + '</td>';
             html += '<td class="xtd" style="text-align: left;">' + data['specification'] + '</td>';
-            html += '<td class="xtd" style="text-align: center;">' + data['stockAmount'] + '</td>';
+            html += '<td class="xtd" style="text-align: center;">' + data['buyAmt'] + '</td>';
             html += '<td class="xtd" style="text-align: center;">' + data['buyPrice'] + '</td>';
             html += '<td class="xtd" style="text-align: center;">' + data['packRetprice'] + '</td>';
             html += '<td class="xtd" style="text-align: center;">' + buyPrice + '</td>';