fix: 冲突

cloudroam

2024-10-23 8c469898c0a71224e17780696d47581de47c9ed7

 src/main/java/com/mzl/flower/dto/request/payment/OrderItemCheckCommitReduceDTO.java

@@ -9,9 +9,6 @@

@Data
public class OrderItemCheckCommitReduceDTO extends OrderItemCheckCommitDTO {
    @ApiModelProperty(value = "订单商品id")
    private List<String> pictureList;

    @ApiModelProperty(value = "处理类型")
    private String targetLevel;