Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-10-15 7c4f93e72f2f0b4a9c5dd7c3ba35802357ec5e84

 zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java

@@ -116,7 +116,6 @@
            }
        } else {
            queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
            queryUse.setIsOver(Dictionary.FLAG_NO_N);
        }

        queryUse.setQueryKey(serviceVipProjDto.getQueryKey());