Merge branch 'dev' of yeshijie/patient-co-management into dev

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/ZysoftBaseService.java

@@ -65,7 +65,7 @@ public class ZysoftBaseService {
    public Result addZyPushLog(String request, String api, String content, String error, String method, String status, String type,String errMsg){
        Result re = null;
        if(errMsg==null){
            re = Result.success("接收线下处方调整完成消息成功");
            re = Result.success(content);
        }else {
            re = Result.error(-1,errMsg);
        }