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

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

@@ -490,7 +490,7 @@ public class WelcomeServiceImpl implements WelcomeService {
             media.setWelcomeId(one.getWelcomeId());
             media.setMediaUrl("-1");
             media.setMediaSize("0");
-            media.setMiniProgramId(null);
+            media.setMiniProgramId("-1");
             media.setCreateTime(new Date());
             media.setDeleteFlag(0);
             // 媒体类型 - 根据历史配置的加好友配置设置

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

@@ -630,6 +630,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         messageBaseDTO.setAppid(miniprogramSetting.getAppId());
         messageBaseDTO.setPicMediaId(miniprogramSetting.getMediaId());
         messageBaseDTO.setTitle(miniprogramSetting.getTitle());
+        messageBaseDTO.setPage(config.getMemberOpenPage());
         attachments.add(messageBaseDTO);
     }
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java

@@ -732,6 +732,7 @@ public class WxEnterpriseController extends WebBaseController {
      * 保存欢迎语
      *
      * @return
+     * @deprecated : 欢迎语功能统一迁移到 {@link WelcomeController}
      */
     @RequestMapping("save-welcome")
     public HaobanResponse savewelcome(String title, String welcomeContent, String welcomeImg) {
@@ -754,6 +755,7 @@ public class WxEnterpriseController extends WebBaseController {
      * 欢迎语列表
      *
      * @return
+     * @deprecated : 欢迎语功能统一迁移到 {@link WelcomeController}
      */
     @RequestMapping("get-welcome")
     public HaobanResponse getWelcome() {