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

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

@@ -535,6 +535,7 @@ public class WelcomeServiceImpl implements WelcomeService {
             bo.setMediaTitle(one.getMediaTitle());
             bo.setMediaType(one.getMediaType());
             bo.setMediaUrl(one.getMediaUrl());
+            bo.setMiniProgramPage(one.getMiniProgramPage());
             bo.setMediaSize(one.getMediaSize());
             bo.setMiniprogramSettingId(one.getMiniProgramId());
             return bo;