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

maven

23 小时以前 d9ff3817f056ad245a16bd394133a407d6c6b9cf

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

@@ -26,9 +26,4 @@

    @ApiModelProperty(value = "报工id")
    private Long productMainId;
    @ApiModelProperty(value = "实际开始时间")
    private LocalDateTime actualStartTime;

    @ApiModelProperty(value = "实际结束时间")
    private LocalDateTime actualEndTime;
}