From b64dfe0172b04830bd16c3aa5757fa87d291057f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 01 四月 2021 09:16:29 +0800
Subject: [PATCH] 合并代码 并且解决冲突
---
java110-generator/src/main/java/com/java110/code/web/GeneratorStart.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/java110-generator/src/main/java/com/java110/code/web/GeneratorStart.java b/java110-generator/src/main/java/com/java110/code/web/GeneratorStart.java
index 5e37dc6..92d746c 100644
--- a/java110-generator/src/main/java/com/java110/code/web/GeneratorStart.java
+++ b/java110-generator/src/main/java/com/java110/code/web/GeneratorStart.java
@@ -7,7 +7,7 @@
public static void main(String[] args) throws Exception {
//鍔犺浇閰嶇疆
- StringBuffer sb = readFile(GeneratorStart.class.getResource("/web/template_prestoreFee.json").getFile());
+ StringBuffer sb = readFile(GeneratorStart.class.getResource("/web/template_1.json").getFile());
JSONObject data = JSONObject.parseObject(sb.toString());
--
Gitblit v1.8.0