Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

3 天以前 a92b12d5adaa8827c1474d42b73c98e17953ecb5

 src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java

@@ -92,4 +92,10 @@
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @TableField(value = "end_time")
    private LocalDateTime endTime;

    @TableField(value = "device_id")
    private Long deviceId;

    @TableField(value = "device_name")
    private String deviceName;
}