Merge remote-tracking branch 'origin/dev' into dev

2026-03-10 23:16:29 +08:00
parent eabbec3cc1 5be1ea50c2
commit cc17d1d0e2
25 changed files with 427 additions and 152 deletions
@@ -212,11 +212,11 @@ public class ReconciliationDTO extends BaseVOEntity{
    @ApiModelProperty("创建时间开始")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "创建时间开始", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createTimeStart;
+    private String createTimeStart;
    @ApiModelProperty("创建时间结束")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "创建时间结束", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createTimeEnd;
+    private String createTimeEnd;
    @ApiModelProperty("审核时间开始")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "审核时间开始", width = 30, dateFormat = "yyyy-MM-dd")