Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/patzn/cloud/service/lims/hmhj/controller/NoticeAnnouncementController.java

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/NoticeAnnouncementController.java

@@ -35,9 +35,9 @@ public class NoticeAnnouncementController extends ServiceController {
             @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
     })
     @PostMapping("/page")
-	public RestResult<Page<NoticeAnnouncement>> getPage(NoticeAnnouncement noticeAnnouncement) {
+    public RestResult<Page<NoticeAnnouncement>> getPage(NoticeAnnouncement noticeAnnouncement) {
         return success(noticeAnnouncementService.page(getPage(), noticeAnnouncement));
-	}
+    }
 
     @ApiOperation("查询 id 信息")
     @ApiImplicitParams({
@@ -61,7 +61,7 @@ public class NoticeAnnouncementController extends ServiceController {
 
     @ApiOperation("添加")
     @PostMapping("/")
-	public RestResult<Boolean> add(NoticeAnnouncement noticeAnnouncement) {
+    public RestResult<Boolean> add(NoticeAnnouncement noticeAnnouncement) {
         noticeAnnouncement.setCreator(getAccount().getUserName());
         return success(noticeAnnouncementService.save(noticeAnnouncement));
 	}