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

jyy

2021-04-07 21db21a114356e0704a3483c1a3f22b96ea6658b

 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) {