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

陶杰

2024-12-06 984c102eb4e632985e45b7c4be1545c53c87b589

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

@@ -37,7 +37,7 @@
    private String flowerLevelStr;

    @ApiModelProperty(value = "订单商品状态")
    @DictTrans(target = "statusStr", codeType = "CHECK_OPERATE")
    @DictTrans(target = "statusStr", codeType = "ORDER_ITEM_STATUS")
    private String status;
    private String statusStr;