解决冲突

mitao

2025-02-12 84f28e6743089c1147e078763de6eafe52d0dc31

 medicalWaste-system/src/main/java/com/sinata/system/domain/dto/CollectCarTotalUpDto.java

@@ -19,4 +19,5 @@
    private Integer num;
    @ApiModelProperty("总重量")
    private BigDecimal weight;
    private  String  wasteTypeStr;
}