Merge branch 'score_shop' into api_score_meger

jyy

2021-07-16 2437327e2a9f89c6ee8c93e468939cf49ff8bd71

 zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java

@@ -221,7 +221,7 @@
    /**
     * 收款
     */
    @RequestMapping(value = "sk")
    @RequestMapping(value = "/sk")
    public @ResponseBody
    AjaxResult sk(SysOrder order) throws GlobleException {
        orderService.updateReceiptMoney(order);