Merge branch 'dev' into pre-production

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillOrderVO.java

@@ -18,7 +18,7 @@ public class DistributionBillOrderVO {
 	/**
 	 * 应提货件数
 	 */
-	private String handQuantity;
+	private Integer handQuantity;
 	private String materialName;
 
 	private String preparedQuantity;