mengkuiliang dc1b4c681e Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920 ... # Conflicts: # xinelu-nurse-applet/src/main/java/com/xinelu/applet/mapper/chatrecord/ChatRecordMapper.java # xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/chatRecord/IChatRecordService.java # xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/chatRecord/impl/ChatRecordServiceImpl.java # xinelu-nurse-applet/src/main/resources/mapper/applet/chatrecord/ChatRecordMapper.xml		2023-10-25 14:44:37 +08:00
..
controller	Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920	2023-10-25 14:44:37 +08:00
domain	Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920	2023-10-25 14:44:37 +08:00
dto
mapper
service	家医消息通知接口修改	2023-10-25 11:05:08 +08:00
vo	Merge remote-tracking branch 'origin/jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支	2023-10-24 16:07:41 +08:00