From fee66fde68610850d4c8c52df022b9d53a0cd3f7 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: Wed, 21 Sep 2022 14:40:34 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyWorkApproveReqDTO.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyWorkApproveReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyWorkApproveReqDTO.java
index 6428061..b1ab4b1 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyWorkApproveReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyWorkApproveReqDTO.java
@@ -1,6 +1,16 @@
package com.gkhy.safePlatform.emergency.model.dto.req;
public class EmergencyWorkApproveReqDTO {
+ //排序
+ private Integer sort ;
+
+ public Integer getSort() {
+ return sort;
+ }
+
+ public void setSort(Integer sort) {
+ this.sort = sort;
+ }
private Long id;
@@ -10,11 +20,15 @@
private String title;
//提交人ID/外键
private Long submitPersonId;
+ //提交人名称/外键
+ private String submitPersonName;
//审批人ID/外键
private Long approvePersonId;
+ //审批人名称/外键
+ private String approvePersonName;
//审批状态 1：未审批 2：审批中 3：审批完成
private Integer approveStatus;
- //审批意见
+ //审批结果 0不通过 1通过
private Boolean approveResult;
//审批意见
private String approveMemo;
@@ -25,6 +39,22 @@
//关联业务说明
private String relateDesc;
+ public String getSubmitPersonName() {
+ return submitPersonName;
+ }
+
+ public void setSubmitPersonName(String submitPersonName) {
+ this.submitPersonName = submitPersonName;
+ }
+
+ public String getApprovePersonName() {
+ return approvePersonName;
+ }
+
+ public void setApprovePersonName(String approvePersonName) {
+ this.approvePersonName = approvePersonName;
+ }
+
public Long getId() {
return id;
}
--
Gitblit v1.9.2