Merge branch 'master' into wangfy-dev

wfy

2021-09-18 0417d31de9980cbc1735daffffb308d050ce35b4

 service-api/src/main/java/com/java110/api/smo/msg/impl/ListMsgSMOImpl.java

@@ -52,7 +52,7 @@
        //将用户ID刷掉
       // paramIn.remove("userId");

        String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/msg.listMsg" + mapToUrlParam(paramIn);
        String apiUrl = "msg.listMsg" + mapToUrlParam(paramIn);


        ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, "",