Merge branch 'div_12'

yujian

2019-05-14 ad9fbd2c18f280ef9bba47f28353d367cf2d94e8

Merge branch 'div_12'

Conflicts:
	fanli/src/main/java/com/yeshi/fanli/controller/TestController.java

 fanli/src/main/java/com/yeshi/fanli/controller/TestController.java

@@ -216,8 +216,7 @@
                    pw.print(els.get(i).html().replace("var brandData =", "").trim().split("};")[0] + "}");

                }

            }



        } catch (IOException e) { 
        } catch (IOException e) {

            e.printStackTrace();

        }