Merge remote-tracking branch 'origin/master'

zss

2025-03-25 66990e9be43f71b89aa42065d696b682d803afa6

 cnas-server/src/main/java/com/yuanchu/mom/pojo/DeviceBorrow.java

@@ -66,6 +66,7 @@

    @ValueTableShow(5)
    @ApiModelProperty("借用日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @ExcelProperty(value = "提交日期")
    private Date recipientTime;