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

admin

2020-03-12 7a40d9ca41da29aee9464f545e10b452a1922c32

 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/WXMPDynamicInfoServiceImpl.java

@@ -66,7 +66,8 @@
      try {

         convertContent = convertLinkManager.convertLinkFromText(info.getContent(), uid, true);

      } catch (Exception e) {

         throw new WXMPDynamicInfoException(2, e.getMessage());

         e.printStackTrace();

         throw new WXMPDynamicInfoException(2, "转链出错");

      }

      wxmpDynamicInfoDao.addShareCount(id);

      return convertContent;