Merge remote-tracking branch 'origin/develop' into develop

zc-business/src/main/java/com/zc/business/service/impl/DcTrafficIncidentsServiceImpl.java

@@ -270,18 +270,22 @@ public class DcTrafficIncidentsServiceImpl implements IDcTrafficIncidentsService
 
         Map<String,Object> smallCar = new HashMap<>();
         smallCar.put("type","smallCar");
+        smallCar.put("typeName","小型车");
         smallCar.put("num",0);
         smallCar.put("allTime",0);
         Map<String,Object> trucks = new HashMap<>();
         trucks.put("type","trucks");
+        trucks.put("typeName","货车");
         trucks.put("num",0);
         trucks.put("allTime",0);
         Map<String,Object> buses = new HashMap<>();
         buses.put("type","buses");
+        buses.put("typeName","客车");
         buses.put("num",0);
         buses.put("allTime",0);
         Map<String,Object> tankers = new HashMap<>();
         tankers.put("type","tankers");
+        tankers.put("typeName","罐车");
         tankers.put("num",0);
         tankers.put("allTime",0);