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

陶杰

2024-12-21 331c41ca7f21b81985ba23d60ec05c350d21daa8

 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;

}