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

jyy

2021-03-12 baa79615425b71521e67ec8a9344b88ce53fc5de

 zq-erp/src/test/java/com/matrix/SourceFlowTests.java

@@ -125,7 +125,7 @@

      for (SysOrder sysOrder : sysOrders) {
         sysOrder.setCashPay(sysOrder.getZkTotal());
         sysOrder.setCardPay(0);
         sysOrder.setCardPay(0D);
         sysOrderDao.update(sysOrder);

         List<SysOrderItem> items = sysOrderItemDao.selectByOrderId(sysOrder.getId());