Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-08 bc9bd69850c95dacb22c7da4777a1d0470c33722

 src/main/java/com/mzl/flower/dto/response/payment/OrderCheckListDTO.java

@@ -15,9 +15,13 @@

    private String partnerName;//合伙人名称

    private Long warehouseId;//仓库id

    @ApiModelProperty(value = "仓库名称")
    private String warehouseName;

    private Long warehouseLocationId;//库位id

    @ApiModelProperty(value = "库位名称")
    private String warehouseLocationCode;