From a603a470f2d6089674327854247b4e7f2794472c Mon Sep 17 00:00:00 2001
From: xiangwb <xiangwb@drore.com>
Date: Thu, 19 Apr 2018 18:04:17 +0800
Subject: [PATCH] merge

---
 boot-service/src/main/java/com/xwbing/demo/Ademo.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/boot-service/src/main/java/com/xwbing/demo/Ademo.java b/boot-service/src/main/java/com/xwbing/demo/Ademo.java
index 3ac6c98..83ec461 100644
--- a/boot-service/src/main/java/com/xwbing/demo/Ademo.java
+++ b/boot-service/src/main/java/com/xwbing/demo/Ademo.java
@@ -1,5 +1,7 @@
 package com.xwbing.demo;
 
+import com.alibaba.fastjson.JSONArray;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -12,9 +14,11 @@ import java.util.Map;
 public class Ademo {
     public static void main(String[] args) {
         Map<String, String> aa = new HashMap<>();
-        aa.put(null,"aa");
+        aa.put(null, "aa");
         String s = aa.get(null);
         System.out.println(s);
+        JSONArray jsonArray = JSONArray.parseArray("[1,2]");
+        System.out.println("");
 
     }