Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WelcomeServiceImpl.java

@@ -402,6 +402,9 @@ public class WelcomeServiceImpl implements WelcomeService {
             bo.setMediaTitle("图片");
             bo.setMediaType(WelcomeMediaTypeEnum.IMAGE.getCode());
             bo.setMediaUrl(welcome.getWelcomeImg());
+            if (CollectionUtils.isEmpty(matchWelcome.getWelcomeMediaList())) {
+                matchWelcome.setWelcomeMediaList(new ArrayList<>(1));
+            }
             matchWelcome.getWelcomeMediaList().add(bo);
         }
         return matchWelcome;