Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

# Conflicts:
#	patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/synergy/SynergyManagerController.java

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/synergy/SynergyManagerController.java

@@ -293,7 +293,7 @@ public class SynergyManagerController extends BaseController{
     * @param time
     * @return
     */
    @RequestMapping(value = "sendMessage", method = RequestMethod.GET)
    @RequestMapping(value = "/sendMessage", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation("发送消息")
    public String sendMessage(@ApiParam(name = "message",value = "消息对象(如：{'sender':'','receiver':'','relationCode':'','type':19})",required = true)