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

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java

@@ -40,9 +40,9 @@ public class WmsAutoPurchasePartModel extends Pager {
     private String vendorName;
 
     @ApiParam("要货时间")
-    private String arriveTime;
+    private Integer arriveTime;
 
-    public WmsAutoPurchasePartModel(String partNo, String partName, Integer qty, String warehouse, String arriveTime) {
+    public WmsAutoPurchasePartModel(String partNo, String partName, Integer qty, String warehouse, Integer arriveTime) {
         this.partNo = partNo;
         this.partName = partName;
         this.qty = qty;