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

admin

2020-03-12 7a40d9ca41da29aee9464f545e10b452a1922c32

 fanli/src/main/java/com/yeshi/fanli/controller/admin/goods/ConvertLinkController.java

@@ -40,7 +40,7 @@
         result = convertLinkManager.convertLinkFromText(content, Long.parseLong(uid), share);

      } catch (NumberFormatException e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("用户ID转换出错"));

      } catch (Exception e) {

      }catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMessage()));

         return;

      }