Merge remote-tracking branch 'origin/jtwy' into jtwy

liyong

2026-01-20 ff181c705c98885282668990c84219d17e04be0b

 src/main/java/com/ruoyi/inspectiontask/pojo/QrCodeScanRecord.java

@@ -32,6 +32,12 @@
    @ApiModelProperty(value = "扫码人用户ID")
    private Long scannerId;

    @ApiModelProperty(value = "设备名称")
    private String deviceName;

    @ApiModelProperty(value = "设备id")
    private Integer deviceId;

    @ApiModelProperty(value = "实际扫码时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")