Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

liujie

9 天以前 8e8f1bd4d6290f8c4bf4d98a1b282b01f706e10b

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpIssueReportingController.java

@@ -171,6 +171,7 @@
        erpIssueReporting.setHandlerPerson(nickName);
        erpIssueReporting.setHandlerTime(LocalDateTime.now());
        erpIssueReporting.setHandlerContent(dto.getHandlerContent());
        erpIssueReporting.setHandlerPictures(dto.getHandlerPictures());
        erpIssueReportingService.updateById(erpIssueReporting);
        return R.ok();
    }

 ruoyi-system/src/main/java/com/ruoyi/system/dto/TErpIssueReportingProcessDTO.java

@@ -16,4 +16,7 @@
    @ApiModelProperty(value = "处理内容")
    private String handlerContent;

    @ApiModelProperty(value = "处理图片")
    private String handlerPictures;

}