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

jiangping

2024-05-07 529d0b8982cf30f57ba7e366c0f822c1d82c0b69

 server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java

@@ -119,6 +119,9 @@
    @JsonFormat(pattern = "yyyy-MM-dd")
    @TableField(exist = false)
    private Date queryStartTime;
    @ApiModelProperty(value = "查询类型 1子查询可合并单数", example = "1")
    @TableField(exist = false)
    private  int queryFlag;

    @ApiModelProperty(value = "查询结束日期", example = "1")
    @JsonFormat(pattern = "yyyy-MM-dd")