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

yj

2020-03-13 1da0cccd804b441ac94a35f28a2ed23a6a7062cc

 fanli/src/main/java/com/yeshi/fanli/service/manger/goods/ConvertLinkManager.java

@@ -226,7 +226,7 @@
   public String convertLinkFromText(String text, Long uid, boolean share)

         throws ConvertLinkExceptionException, Exception {

      String newText = convertJDLinkFromText(text, uid, share);

      newText = convertPDDLinkFromText(text, uid, share);

      newText = convertPDDLinkFromText(newText, uid, share);

      newText = convertTBLinkFromText(newText, uid, share);

      if (text.equalsIgnoreCase(newText))

         throw new ConvertLinkExceptionException(ConvertLinkExceptionException.CODE_NONE, "不包含可转链的口令与链接");