合并冲突

common-module/src/main/java/com/tzld/piaoquan/growth/common/service/WeComUserService.java

@@ -23,8 +23,7 @@ public interface WeComUserService {
 
     List<WeComUserVo> getWeComUserByNameAvatar(String name, String avatar);
 
-    List<WeComUserVo> getGroupSendWeComUser(GroupSendWeComUserParam param);
-
     JSONObject getUserDetail(String externalUserId, Long corpId);
+
     Page<WeComUserVo> getGroupSendWeComUser(GroupSendWeComUserParam param);
 }