Merge remote-tracking branch 'origin/master'

liujie

2023-10-25 a1557f3f07287c86e8a4a408f03ba19993e5a48c

 cloud-server-other/src/main/java/com/dsh/other/entity/GetHistoryDto.java

@@ -15,6 +15,5 @@
    private String pleasePic;
    private String passPic;
    private String createBy;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date date;
}