Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-09-19 ab2b3291cb9e21885ed878d60f5afd6640d830f3

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyWorkApproveReqDTO.java

@@ -1,7 +1,7 @@
package com.gkhy.safePlatform.emergency.model.dto.req;

public class EmergencyWorkApproveReqDTO {

    //排序
    private Integer sort ;

    public Integer getSort() {
@@ -28,7 +28,7 @@
    private String approvePersonName;
    //审批状态 1：未审批 2：审批中 3：审批完成
    private Integer approveStatus;
    //审批意见
    //审批结果 0不通过 1通过
    private Boolean approveResult;
    //审批意见
    private String approveMemo;