Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-28 73a0ffbc8f1c5c625ce4bb3225c0e5e30179520e

 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")
@@ -77,7 +77,7 @@
    @TableField("CHECKOUT_TIME")
    private Date checkoutTime;

    @ApiModelProperty("医废状态 1：暂存中 2：运输中 3：已接收 4：已处置")
    @ApiModelProperty("医废状态 1：暂存中; 2：运输中; 3：已接收; 4：已处置;")
    @TableField("STATUS")
    private Integer status;

@@ -93,5 +93,12 @@
    @TableField("COLLECT_TIME")
    private Date collectTime;

    @ApiModelProperty("接收时间")
    @TableField("RECEIVE_TIME")
    private Date receiveTime;





}