Merge remote-tracking branch 'origin/master'

admin

2019-05-21 1b3493d7ff97fd0d3474b12f9a6a435693e124fa

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserNotificationServiceImpl.java

@@ -6,7 +6,7 @@


import org.springframework.stereotype.Service;



import com.yeshi.fanli.controller.client.UserInfoController;

import com.yeshi.fanli.controller.client.v1.UserInfoController;

import com.yeshi.fanli.dao.mybatis.AccountMessageMapper;

import com.yeshi.fanli.entity.bus.user.AccountMessage;

import com.yeshi.fanli.entity.bus.user.BindingAccount;