Merge remote-tracking branch 'origin/api' into api

jyy

2021-01-26 c3c0a5dc4c3ccc8af4809aa3c789ffe5028377e4

 zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-sale-list.html

@@ -116,7 +116,7 @@
      }

      function zkAmountFormat(value, row, index) {
         return row.shouldPay + row.refund - row.totalPay;
         return row.shouldPay + row.refund - row.arrears - row.totalPay;
      }

      function footCountTitle(data) {