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

liyong

3 天以前 a92b12d5adaa8827c1474d42b73c98e17953ecb5

 src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java

@@ -65,4 +65,8 @@
    private Long auditUserId;
    private String auditUserName;

    private Long deviceId;
    private String deviceName;
    private String workMinutes;

}