Merge branch 'wei_master' into '105'

update

See merge request !23

src/main/java/com/server/web/common/service/Impl/InformationServiceImpl.java

@@ -45,7 +45,7 @@ public class InformationServiceImpl implements InformationService {
         Map<String, Object> dataMap = new HashMap<String, Object>();
         dataMap.put("list", list);
         dataMap.put("firstClassName", tBaseFirstClass.getClassName());
-        return returnMap("1", "", list);
+        return returnMap("1", "", dataMap);
     }
 
     /**