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

jyy

2021-01-16 9253517ff8a10e2df7924fdf6e0b737544d1a859

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