解决冲突

src/main/java/com/huiju/estateagents/service/impl/TaShareServiceImpl.java

     }
 
     @Override
-    public ResponseBean selectLiveShareList(Integer pageNum, Integer pageSize, Integer orgId, String personType, String shareType, String phone, Integer liveActivityId) {
+    public ResponseBean listLiveShare(Integer pageNum, Integer pageSize, Integer orgId, String personType, String shareType, String phone, Integer liveActivityId) {
         Page page = new Page(pageNum,pageSize);
         // 分页查询
         List<TaShare> list = taShareMapper.listLiveShare(page, orgId, personType, shareType, phone, liveActivityId);