Merge remote-tracking branch 'upstream/test' into test

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SysUserOfflineModel.java

@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\15 15:58
+ * @Modify:
+ **/
+@Data
+public class SysUserOfflineModel implements Serializable {
+
+
+    @ApiParam("人员ID")
+    private Long userId;
+
+    @ApiParam("用户编号")
+    private String userCode;
+
+    @ApiParam("用户名称")
+    private String userName;
+
+    @ApiParam("登陆名称")
+    private String loginName;
+
+    @ApiParam("组织代码")
+    public String organizeCode;
+
+    public SysUserOfflineModel() {}
+
+    public SysUserOfflineModel(Long userId, String userCode, String userName, String loginName, String organizeCode) {
+        this.userId = userId;
+        this.userCode = userCode;
+        this.userName = userName;
+        this.loginName = loginName;
+        this.organizeCode = organizeCode;
+    }
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java

@@ -70,4 +70,12 @@ public class WmsVendorPart extends BaseBean {
             dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
             searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorName")
     private String vendorName;
+
+    @Column(name = "GRADE")
+    @ApiParam("供应商等级")
+    private String grade;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
 }