Merge branch 'test' of https://gitee.com/jyyforjava/zq-erp into test

Helius

2020-12-27 3eb52981c3e97af186174d7eacbcb7ec0c5f8739

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java

@@ -205,6 +205,7 @@
        sysOrder.setCardPay(cardMoney);
        sysOrder.setCashPay(xjMoney);
        sysOrder.setStatu(Dictionary.ORDER_STATU_DFK);
        sysOrder.setStaffId(user.getSuId());
        sysOrder.setCompanyId(user.getCompanyId());

        sysOrder.setPayTime(new Date());