Merge branch 'feature-wm' into developer

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/ContentMaterialController.java

@@ -224,7 +224,7 @@ public class ContentMaterialController {
     @ResponseBody
     @RequestMapping("/get-material")
     public RestResponse<ContentMaterialInfoVO> getMaterialMember(String enterpriseId,Long contentMaterialId,String clerkId) {
-        ServiceResponse<ContentMaterialDTO> response = contentMaterialApiService.getMaterialMember(enterpriseId, contentMaterialId, clerkId, "");
+        ServiceResponse<ContentMaterialDTO> response = contentMaterialApiService.getMaterialDetail(enterpriseId, contentMaterialId, clerkId);
         if (!response.isSuccess()) {
             return RestResponse.failure(response.getCode(), response.getMessage());
         }