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

935090232@qq.com

2021-01-17 31b85d0135090435438545ece57142d62f185224

 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;
    }