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

admin

2020-05-18 f5444c6b777ba9f1e0825066e9d12fb9ce4f9f72

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java

@@ -644,9 +644,9 @@
                  continue;
               }
               // 跳转过渡页
               String jumpLink = configService.get(ConfigKeyEnum.activityDetailLink.getKey()) + "?type=%s&id=%s";
               jumpLink = String.format(jumpLink, "circle", evaluateNew.getId());
               evaluateNew.setJumpLink(jumpLink);
               //String jumpLink = configService.get(ConfigKeyEnum.activityDetailLink.getKey()) + "?type=%s&id=%s";
               //jumpLink = String.format(jumpLink, "circle", evaluateNew.getId());
               //evaluateNew.setJumpLink(jumpLink);

               // 图片数量
               if (evaluateNew.getImgList() != null && evaluateNew.getImgList().size() > 0) {
@@ -1262,6 +1262,12 @@
            comment = shareInfo.getComment();
         }
      }
		
      if (!StringUtil.isNullOrEmpty(comment)) { // 替换淘宝官方活动
         List<String> activityIdList = convertLinkManager.getTaoBaoOfficialActivityId(comment);
         for (String st : activityIdList)
            comment = comment.replace(st, "");
      }

      JSONObject data = new JSONObject();
      data.put("title", title);