Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

xiaoyong931011

2021-07-23 f3642777d395234ab33aa35f1f49a5c1ee9e9f15

 gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java

@@ -97,6 +97,8 @@
            for (JhyOrder order : addressExist) {
                String orderAddr = order.getArea() + order.getAddress();

                log.info("orderAddr====>>>>{}", orderAddr);
                log.info("address===>{}", address);
                if (orderAddr.equals(address.toString())) {
                    throw new RestException(-3, "同一地址仅能有一单在进行中");
                }