Merge remote-tracking branch 'origin/master'

xiangpei

2024-08-12 399b7ab49bc9f6a20b4306c6fca23d87d3274c36

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ContractResultVO.java

@@ -38,7 +38,7 @@
    @Excel(name = "考核时间", width = 30, dateFormat = "yyyy-MM-dd")
    private Date checkTime;

    private String deleted;
    private Integer deleted;

    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date updateTime;