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

cloudroam

2024-09-11 aa411422f009e2d99ecd6c2bf6aaa75eb1416d2e

 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;