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

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

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.wms.bean.BasVendor;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 供应商微服调用Model
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-30 19:18
+ * @Modify:
+ **/
+@Data
+@Api("供应商微服调用Model")
+public class WmsBasVendorModel extends BaseBean {
+
+    @ApiParam("供应商")
+    private BasVendor basVendor;
+
+    @ApiParam("分页对象")
+    private Pager pager;
+}

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

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.wms.bean.BasVendor;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPart;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 供应商微服调用Model
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-30 19:18
+ * @Modify:
+ **/
+@Data
+@Api("供应商微服调用Model")
+public class WmsPartModel extends BaseBean {
+
+    @ApiParam("物料")
+    private WmsPart wmsPart;
+
+    @ApiParam("分页对象")
+    private Pager pager;
+}