合并代码 并且解决冲突

xiaogang

2021-04-01 b64dfe0172b04830bd16c3aa5757fa87d291057f

 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());