fix conflict

Helius

2022-02-14 59cf24b0aba393e145f4ba3d58e98b7a01a80992

 zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/service/BaseService.java

@@ -38,4 +38,8 @@
    public void setServiceRequest(IServiceRequest request){
        serviceRequest = request;
    }

    public IServiceRequest getServiceRequest() {
        return serviceRequest;
    }
}