update===>:合并冲突。
This commit is contained in:
parent
58263e19d6
commit
6b0bf514e3
@ -25,7 +25,6 @@ import com.xinelu.manage.dto.chatrecord.MessageSearchDto;
|
|||||||
import com.xinelu.manage.mapper.chatrecord.ChatRecordMapper;
|
import com.xinelu.manage.mapper.chatrecord.ChatRecordMapper;
|
||||||
import com.xinelu.manage.service.chatrecord.IChatRecordService;
|
import com.xinelu.manage.service.chatrecord.IChatRecordService;
|
||||||
import com.xinelu.manage.service.chatrecordread.IChatRecordReadService;
|
import com.xinelu.manage.service.chatrecordread.IChatRecordReadService;
|
||||||
import com.xinelu.manage.service.chatrecordread.IChatRecordReadService;
|
|
||||||
import com.xinelu.manage.service.hospitalpersoninfo.IHospitalPersonInfoService;
|
import com.xinelu.manage.service.hospitalpersoninfo.IHospitalPersonInfoService;
|
||||||
import com.xinelu.manage.vo.chatrecord.MessageCenterVo;
|
import com.xinelu.manage.vo.chatrecord.MessageCenterVo;
|
||||||
import com.xinelu.manage.vo.chatrecord.MessageVo;
|
import com.xinelu.manage.vo.chatrecord.MessageVo;
|
||||||
@ -60,8 +59,6 @@ public class ChatRecordServiceImpl implements IChatRecordService {
|
|||||||
@Resource
|
@Resource
|
||||||
private IChatRecordReadService chatRecordReadService;
|
private IChatRecordReadService chatRecordReadService;
|
||||||
@Resource
|
@Resource
|
||||||
private IPatientInfoService patientInfoService;
|
|
||||||
@Resource
|
|
||||||
private HttpService httpService;
|
private HttpService httpService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user