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

Helius

2021-01-16 8e71e461fc119c7863e155e08f803087f1e2a808

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

@@ -437,7 +437,6 @@
        // 设置订单总价与折后价
        order.setTotal(total);
        order.setZkTotal(zkTotal);
        order.setArrears(zkTotal);
        sysOrderDao.update(order);
        return i;
    }