Merge remote-tracking branch 'origin/master-v2' into master-v2

cloudroam

2024-10-12 d390d8f502436eaa17ee8ca7abd3c3f8a11a8514

 src/main/java/com/mzl/flower/dto/request/report/QueryOrderDTO.java

@@ -33,4 +33,7 @@
//    @NotNull(message = "下单日期不能为空")
    private LocalDate calDate;

    @ApiModelProperty(value = "是否是合伙人，默认0")
    private Integer partnerFlag;

}