Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	common/common-entity/src/main/java/com/yihu/jw/entity/base/doctor/BaseDoctorBackgroundDO.java

business/base-service/src/main/java/com/yihu/jw/hospital/message/service/UserMsgContentService.java

@@ -162,7 +162,16 @@ public class UserMsgContentService extends BaseJpaService<BaseUserMsgContentDO,
        if (null!=messageList){
            for (BaseUserMessageDO baseUserMessageDO:messageList){
                String id = baseUserMessageDO.getId();
                Integer type = baseUserMessageDO.getType();
                List<BaseUserMsgContentDO> contentlist=baseUserMsgContentDao.getContentListByID(id);
                if (2==type){
                    baseUserMessageDO.setSenderName(baseUserMessageDO.getSenderName().substring(0,1)+"**");
                    String patientId = baseUserMessageDO.getSender();
                    for (BaseUserMsgContentDO bumLsit:contentlist){
                        bumLsit.setSenderName(bumLsit.getSender()==patientId?bumLsit.getSenderName().substring(0,1)+"**":bumLsit.getSenderName());
                        bumLsit.setReceiverName(bumLsit.getReceiver()==patientId?bumLsit.getReceiverName().substring(0,1)+"**":bumLsit.getReceiverName());
                    }
                }
                baseUserMessageDO.setMsgList(contentlist);
            }
            jsonObject.put("messageList", messageList);

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/message/BannerDoctorController.java

@@ -36,12 +36,14 @@ public class BannerDoctorController extends EnvelopRestEndpoint {
                              @ApiParam(name = "doctorName", value = "doctorName", required = false)
                                  @RequestParam(value = "doctorName", required = false)String doctorName,
                              @ApiParam(name = "content", value = "content", required = false)
                                  @RequestParam(value = "content", required = false)String content){
                                  @RequestParam(value = "content", required = false)String content,
                              @ApiParam(name = "type", value = "type", required = false)
                                  @RequestParam(value = "type", required = false)Integer type){
        List<BaseBannerDoctorDO> resultList = new ArrayList<>();
        if(StringUtils.isNotEmpty(bannerIds)){
            List<String> list =  Arrays.asList(bannerIds.split(","));
            String patientId= getUID();
            resultList = baseBannerDoctorService.bannerGive(patientId,list,content,doctor,doctorName);
            resultList = baseBannerDoctorService.bannerGive(patientId,list,content,doctor,doctorName,type);
        }
    return success("赠送成功",resultList);
    }