Merge remote-tracking branch 'origin/master'

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrddailyreport/IotRdDailyReportController.java

@@ -193,6 +193,7 @@ public class IotRdDailyReportController {
         // 查询日报生产动态明细
         IotRdDailyReportDetailPageReqVO detailReqVO = new IotRdDailyReportDetailPageReqVO();
         detailReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        detailReqVO.setReportId(dailyReport.getId());
         PageResult<IotRdDailyReportDetailDO> reportDetailPage = iotRdDailyReportDetailMapper.selectPage(detailReqVO);
         List<IotRdDailyReportDetailDO> reportDetails = reportDetailPage.getList();
         if (CollUtil.isNotEmpty(reportDetails)) {

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrydailyreport/vo/IotRyDailyReportSaveReqVO.java

@@ -190,6 +190,6 @@ public class IotRyDailyReportSaveReqVO {
     @Schema(description = "编辑标识 Y N")
     private String editFlag;
 
-    @Schema(description = "运行记录工单创建日期")
+    @Schema(description = "日报生产动态明细")
     private List<IotRyDailyReportDetailSaveReqVO> reportDetails;
 }