Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-28 7dff38876f582644ae95daad8ac21d4f57088d56

 medicalWaste-system/src/main/java/com/sinata/system/domain/MwCollectRecord.java

@@ -59,7 +59,7 @@

    @ApiModelProperty("医废类型（数据字典id)")
    @TableField("WASTE_TYPE")
    private Integer wasteType;
    private Long wasteType;

    @ApiModelProperty("医废类型名称(冗余)")
    @TableField("WASTE_TYPE_STR")
@@ -93,5 +93,9 @@
    @TableField("COLLECT_TIME")
    private Date collectTime;

    @ApiModelProperty("处置记录id")
    @TableField("DISPOSAL_HANDLE_RECORD_ID")
    private Long disposalHandleRecordId;


}