解决冲突

mitao

2025-02-12 84f28e6743089c1147e078763de6eafe52d0dc31

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

@@ -46,5 +46,9 @@
    @TableField("OPERATOR")
    private String operator;

    @ApiModelProperty("备注")
    @TableField("REMARK")
    private String remark;


}