Merge remote-tracking branch 'origin/master'

src/main/java/com/steerinfo/dil/controller/StatisticalReportController.java

@@ -544,7 +544,7 @@ public class StatisticalReportController extends BaseRESTfulController {
                                                     Integer pageSize,
                                                     String startTime,
                                                     String endTime,
-                                                   String con
+                                                    String con
     ){
         if (con != null && !"undefined".equals(con)) {
             mapValue.put("con",con);

src/main/java/com/steerinfo/dil/service/impl/TmstruckTimeTaskResultServiceImpl.java

@@ -51,7 +51,7 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
     private BmsTruckFeign bmsTruckFeign;
     @Autowired
     private AmsFeign amsFeign;
-    private static final String TwoHour="16吨吊车,12吨吊车,35吨吊车,25吨吊车,70吨吊车,80吨吊车";
+    private static final String TwoHour="16吨吊车,12吨吊车,35吨吊车,25吨吊车,70吨吊车,80吨吊车,50吨吊车";
     private static final String FourHour="220吨吊车,130吨吊车,120吨吊车,150吨吊车,100吨吊车";