Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-02 268809bb4d1ace0bbe8ec20262ebb7d7822c8630

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

@@ -25,5 +25,6 @@
    @ApiModelProperty("接收时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date receiveTime;
    private String wasteTypeStr;

}