From 666e5d4bae10a7082823bfbe91d0fa7e51f5ad2d Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@MS-20170306HGUF>
Date: 星期日, 01 三月 2020 12:19:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/goods/ConvertLinkController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/goods/ConvertLinkController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/goods/ConvertLinkController.java
index b250d05..c24f195 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/goods/ConvertLinkController.java
+++ b/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;
 		}

--
Gitblit v1.8.0