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

cloudroam

2024-09-11 aa411422f009e2d99ecd6c2bf6aaa75eb1416d2e

 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;