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/resp/EmergencyWorkApprovePageRespDTO.java

@@ -5,7 +5,7 @@
import java.util.Date;

public class EmergencyWorkApprovePageRespDTO {

    //排序
    private Integer sort ;

    public Integer getSort() {
@@ -17,6 +17,7 @@
    }

    private Long id;
    //更新时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date gmtCreate;