Merge branch 'master' into dev

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

@@ -115,7 +115,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
     }
 
     //属于采购订单的订单类型（先计毛后计皮）
-    final private List<Integer> judgeOrderTypeList = Arrays.asList(5, 6, 7, 8, 9, 12, 14, 17, 18);
+    final private List<Integer> judgeOrderTypeList = Arrays.asList(5, 6, 7, 8, 9, 12, 14,15, 17, 18);
 
     /**
      * 生成汽运计量实体类