From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java |  391 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 390 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java
index ea2c8ea..6492039 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java
@@ -151,6 +151,395 @@
 	private Long pageNo;
 	private Long pageSize;
 	private String keyword;
-	@ApiModelProperty(value = "查看类型1用户查看自己的调解事件申请2专家查看自己受理的调解事件")
+	@ApiModelProperty(value = "查看类型1用户查看自己的调解事件申请2专家查看自己受理的调解事件,3后台查看")
 	private Integer userType;
+	private Integer usertype;
+
+	public static long getSerialVersionUID() {
+		return serialVersionUID;
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getOrderSn() {
+		return orderSn;
+	}
+
+	public void setOrderSn(String orderSn) {
+		this.orderSn = orderSn;
+	}
+
+	public Long getRequestUserId() {
+		return requestUserId;
+	}
+
+	public void setRequestUserId(Long requestUserId) {
+		this.requestUserId = requestUserId;
+	}
+
+	public Integer getUserEventStatus() {
+		return userEventStatus;
+	}
+
+	public void setUserEventStatus(Integer userEventStatus) {
+		this.userEventStatus = userEventStatus;
+	}
+
+	public String getRequestUserEventDes() {
+		return requestUserEventDes;
+	}
+
+	public void setRequestUserEventDes(String requestUserEventDes) {
+		this.requestUserEventDes = requestUserEventDes;
+	}
+
+	public String getRequestUserName() {
+		return requestUserName;
+	}
+
+	public void setRequestUserName(String requestUserName) {
+		this.requestUserName = requestUserName;
+	}
+
+	public String getRequestUserTel() {
+		return requestUserTel;
+	}
+
+	public void setRequestUserTel(String requestUserTel) {
+		this.requestUserTel = requestUserTel;
+	}
+
+	public Long getEventCategory() {
+		return eventCategory;
+	}
+
+	public void setEventCategory(Long eventCategory) {
+		this.eventCategory = eventCategory;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public Date getSubmitDate() {
+		return submitDate;
+	}
+
+	public void setSubmitDate(Date submitDate) {
+		this.submitDate = submitDate;
+	}
+
+	public Date getAppointmentTime() {
+		return appointmentTime;
+	}
+
+	public void setAppointmentTime(Date appointmentTime) {
+		this.appointmentTime = appointmentTime;
+	}
+
+	public Long getRequestUserCommunity() {
+		return requestUserCommunity;
+	}
+
+	public void setRequestUserCommunity(Long requestUserCommunity) {
+		this.requestUserCommunity = requestUserCommunity;
+	}
+
+	public String getCenterId() {
+		return centerId;
+	}
+
+	public void setCenterId(String centerId) {
+		this.centerId = centerId;
+	}
+
+	public String getCenterTel() {
+		return centerTel;
+	}
+
+	public void setCenterTel(String centerTel) {
+		this.centerTel = centerTel;
+	}
+
+	public String getSpecialistOrg() {
+		return specialistOrg;
+	}
+
+	public void setSpecialistOrg(String specialistOrg) {
+		this.specialistOrg = specialistOrg;
+	}
+
+	public String getSpecialistLevel() {
+		return specialistLevel;
+	}
+
+	public void setSpecialistLevel(String specialistLevel) {
+		this.specialistLevel = specialistLevel;
+	}
+
+	public Long getSpecialistId() {
+		return specialistId;
+	}
+
+	public void setSpecialistId(Long specialistId) {
+		this.specialistId = specialistId;
+	}
+
+	public String getSpecialistName() {
+		return specialistName;
+	}
+
+	public void setSpecialistName(String specialistName) {
+		this.specialistName = specialistName;
+	}
+
+	public String getSpecialistTel() {
+		return specialistTel;
+	}
+
+	public void setSpecialistTel(String specialistTel) {
+		this.specialistTel = specialistTel;
+	}
+
+	public Date getSpecialistAcceptTime() {
+		return specialistAcceptTime;
+	}
+
+	public void setSpecialistAcceptTime(Date specialistAcceptTime) {
+		this.specialistAcceptTime = specialistAcceptTime;
+	}
+
+	public Integer getRevokeType() {
+		return revokeType;
+	}
+
+	public void setRevokeType(Integer revokeType) {
+		this.revokeType = revokeType;
+	}
+
+	public Integer getEventProcessStatus() {
+		return eventProcessStatus;
+	}
+
+	public void setEventProcessStatus(Integer eventProcessStatus) {
+		this.eventProcessStatus = eventProcessStatus;
+	}
+
+	public Integer getCurrentProcessType() {
+		return currentProcessType;
+	}
+
+	public void setCurrentProcessType(Integer currentProcessType) {
+		this.currentProcessType = currentProcessType;
+	}
+
+	public String getCurrentOrgId() {
+		return currentOrgId;
+	}
+
+	public void setCurrentOrgId(String currentOrgId) {
+		this.currentOrgId = currentOrgId;
+	}
+
+	public Long getCurrentProcessUserId() {
+		return currentProcessUserId;
+	}
+
+	public void setCurrentProcessUserId(Long currentProcessUserId) {
+		this.currentProcessUserId = currentProcessUserId;
+	}
+
+	public String getCurrentProcessUserName() {
+		return currentProcessUserName;
+	}
+
+	public void setCurrentProcessUserName(String currentProcessUserName) {
+		this.currentProcessUserName = currentProcessUserName;
+	}
+
+	public String getCurrentEventProcessResult() {
+		return currentEventProcessResult;
+	}
+
+	public void setCurrentEventProcessResult(String currentEventProcessResult) {
+		this.currentEventProcessResult = currentEventProcessResult;
+	}
+
+	public Integer getEventSucceed() {
+		return eventSucceed;
+	}
+
+	public void setEventSucceed(Integer eventSucceed) {
+		this.eventSucceed = eventSucceed;
+	}
+
+	public String getRevokeDes() {
+		return revokeDes;
+	}
+
+	public void setRevokeDes(String revokeDes) {
+		this.revokeDes = revokeDes;
+	}
+
+	public Integer getEventResult() {
+		return eventResult;
+	}
+
+	public void setEventResult(Integer eventResult) {
+		this.eventResult = eventResult;
+	}
+
+	public Boolean getReportSuperior() {
+		return reportSuperior;
+	}
+
+	public void setReportSuperior(Boolean reportSuperior) {
+		this.reportSuperior = reportSuperior;
+	}
+
+	public String getResult() {
+		return result;
+	}
+
+	public void setResult(String result) {
+		this.result = result;
+	}
+
+	public Date getResultDate() {
+		return resultDate;
+	}
+
+	public void setResultDate(Date resultDate) {
+		this.resultDate = resultDate;
+	}
+
+	public Boolean getUrgent() {
+		return urgent;
+	}
+
+	public void setUrgent(Boolean urgent) {
+		this.urgent = urgent;
+	}
+
+	public Boolean getDifficult() {
+		return difficult;
+	}
+
+	public void setDifficult(Boolean difficult) {
+		this.difficult = difficult;
+	}
+
+	public Boolean getUrgentDell() {
+		return urgentDell;
+	}
+
+	public void setUrgentDell(Boolean urgentDell) {
+		this.urgentDell = urgentDell;
+	}
+
+	public Boolean getInvalid() {
+		return invalid;
+	}
+
+	public void setInvalid(Boolean invalid) {
+		this.invalid = invalid;
+	}
+
+	public Boolean getMajor() {
+		return major;
+	}
+
+	public void setMajor(Boolean major) {
+		this.major = major;
+	}
+
+	public String getRequestUserResponse() {
+		return requestUserResponse;
+	}
+
+	public void setRequestUserResponse(String requestUserResponse) {
+		this.requestUserResponse = requestUserResponse;
+	}
+
+	public Long getCreateBy() {
+		return createBy;
+	}
+
+	public void setCreateBy(Long createBy) {
+		this.createBy = createBy;
+	}
+
+	public Date getCreateAt() {
+		return createAt;
+	}
+
+	public void setCreateAt(Date createAt) {
+		this.createAt = createAt;
+	}
+
+	public Long getUpdateBy() {
+		return updateBy;
+	}
+
+	public void setUpdateBy(Long updateBy) {
+		this.updateBy = updateBy;
+	}
+
+	public Date getUpdateAt() {
+		return updateAt;
+	}
+
+	public void setUpdateAt(Date updateAt) {
+		this.updateAt = updateAt;
+	}
+
+	public Long getPageNo() {
+		return pageNo;
+	}
+
+	public void setPageNo(Long pageNo) {
+		this.pageNo = pageNo;
+	}
+
+	public Long getPageSize() {
+		return pageSize;
+	}
+
+	public void setPageSize(Long pageSize) {
+		this.pageSize = pageSize;
+	}
+
+	public String getKeyword() {
+		return keyword;
+	}
+
+	public void setKeyword(String keyword) {
+		this.keyword = keyword;
+	}
+
+	public Integer getUserType() {
+		return userType;
+	}
+
+	public void setUserType(Integer userType) {
+		this.userType = userType;
+	}
+
+	public Integer getUsertype() {
+		return usertype;
+	}
+
+	public void setUsertype(Integer usertype) {
+		this.usertype = usertype;
+	}
 }

--
Gitblit v1.7.1