Merge remote-tracking branch 'origin/master'

whepi-web/src/main/java/com/bofeng/service/RiBaoService.java

@@ -156,7 +156,7 @@ public class RiBaoService {
     public MsReport getRibaoWithDate(Long userCreate, String reportDate) {
         List<MsReport> msReportList = msReportMapper.selectByReportDate(reportDate, userCreate);
         if (CollectionUtils.isEmpty(msReportList)) {
-            return null;
+            return new MsReport();
         }
 
         MsReport msReport = msReportList.get(0);