Conflict resolution

8a24dcbd · 高洋 · 8b2a91d5 · 2930ca97 · 8a24dcbd
Commit 8a24dcbd authored Aug 23, 2017 by 高洋
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

code-generator.md 后端开发/code-generator.md +1 -1

No files found.
--- a/后端开发/code-generator.md
+++ b/后端开发/code-generator.md
@@ -4,7 +4,7 @@
 本功能可根据数据表生成相关的dto，mapper impl，service，controller与html，包含相关的增删改查功能。
-**网页入口**：http:\/\/localhost:8080\/hel\/generator\/generator.html
+**网页入口**：http://localhost:8080/hel/generator/generator.html
 ## 使用说明：