Merge branch 'hive2.0' into api

jyy

2021-01-25 dc1a4670261bc852f643d19a83ffc53eeac1b902

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

@@ -1170,6 +1170,7 @@
        order.setStaffId(user.getSuId());
        order.setIsCross(2 + "");
        order.setStatu(Dictionary.ORDER_STATU_YFK);
        order.setCompanyId(user.getCompanyId());
        sysOrderDao.insert(order);

        SysOrderItem orderItem = new SysOrderItem();