fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

 src/main/java/com/xcong/excoin/modules/helpCenter/service/HelpCenterService.java

@@ -23,5 +23,11 @@


   Result getNoticeList(@Valid NoticePageDto noticePageDto);



   Result getAboutUs();



   Result getUserAgreement();



   Result getFristNewNoticeList(@Valid NewNoticePageDto newNoticePageDto);





}