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

common/common-rest-model/src/main/java/com.yihu.wlyy/rest/model/common/SimpleResult.java

@@ -22,4 +22,6 @@ public class SimpleResult<T> extends BaseResponse {
    public void setData(T data) {
        this.data = data;
    }
}

common/common-rest-model/src/main/java/com.yihu.wlyy/rest/model/common/base/ErrorResponse.java

@@ -5,19 +5,18 @@ import io.swagger.annotations.ApiModelProperty;
public class ErrorResponse {
    @ApiModelProperty("错误代码")
    private int status;
    private int code=200;
    @ApiModelProperty("错误消息")
    private String msg;
    @ApiModelProperty("返回时间戳")
    private long timestamp;
    public int getStatus() {
        return status;
    public int getCode() {
        return code;
    }
    public void setStatus(int status) {
        this.status = status;
    public void setCode(int code) {
        this.code = code;
    }
    public String getMsg() {

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/service/template/DoctorFeldsherTemplateService.java

@@ -95,7 +95,7 @@ public class DoctorFeldsherTemplateService extends BaseService {
            sendJson.put("keyword2", dateFormat.format(new Date()));
            sendJson.put("first", first);
            sendJson.put("remark", remark);
            sendJson.put("url", url+ "openid=" + openId +"&toUser=" + patient + "&toName=" +name);//带参数的模板跳转链接
            sendJson.put("url", url+ "&openid=" + openId +"&toUser=" + patient + "&toName=" +name);//带参数的模板跳转链接
            sendJson.put("toUser", patient);//带参数的模板跳转链接
            pushMsgTask.putWxMsg(weiXinAccessTokenUtils.getAccessToken(), 11, openId, name, sendJson);
            //发送代理人