diff --git a/src/main/java/com/xujie/sys/modules/srm/data/SrmDocumentListDefinitionData.java b/src/main/java/com/xujie/sys/modules/srm/data/SrmDocumentListDefinitionData.java
new file mode 100644
index 00000000..f990cb6b
--- /dev/null
+++ b/src/main/java/com/xujie/sys/modules/srm/data/SrmDocumentListDefinitionData.java
@@ -0,0 +1,10 @@
+package com.xujie.sys.modules.srm.data;
+
+import lombok.Data;
+import org.apache.ibatis.type.Alias;
+
+@Data
+@Alias("SrmDocumentListDefinitionData")
+public class SrmDocumentListDefinitionData {
+
+}
diff --git a/src/main/java/com/xujie/sys/modules/srm/entity/SrmDocumentListDefinition.java b/src/main/java/com/xujie/sys/modules/srm/entity/SrmDocumentListDefinition.java
new file mode 100644
index 00000000..42e7cf92
--- /dev/null
+++ b/src/main/java/com/xujie/sys/modules/srm/entity/SrmDocumentListDefinition.java
@@ -0,0 +1,172 @@
+package com.xujie.sys.modules.srm.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xujie.sys.common.utils.QueryPage;
+import com.xujie.sys.modules.srm.data.SrmSupplierData;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+public class SrmDocumentListDefinition extends QueryPage {
+ /**
+ *
+ */
+ private Integer id;
+
+ /**
+ *
+ */
+ private String site;
+
+ /**
+ *
+ */
+ private Integer objectNo;
+
+ /**
+ *
+ */
+ private Integer objectType;
+
+ /**
+ *
+ */
+ private String documentTypeId;
+
+ /**
+ *
+ */
+ private String manualFlag;
+
+ /**
+ *
+ */
+ private String uploadedFlag;
+
+ /**
+ *
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date validTo;
+
+ /**
+ *
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date createDate;
+
+ /**
+ *
+ */
+ private String createdBy;
+
+ /**
+ *
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date updateDate;
+
+ /**
+ *
+ */
+ private String updateBy;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getSite() {
+ return site;
+ }
+
+ public void setSite(String site) {
+ this.site = site;
+ }
+
+ public Integer getObjectNo() {
+ return objectNo;
+ }
+
+ public void setObjectNo(Integer objectNo) {
+ this.objectNo = objectNo;
+ }
+
+ public Integer getObjectType() {
+ return objectType;
+ }
+
+ public void setObjectType(Integer objectType) {
+ this.objectType = objectType;
+ }
+
+ public String getDocumentTypeId() {
+ return documentTypeId;
+ }
+
+ public void setDocumentTypeId(String documentTypeId) {
+ this.documentTypeId = documentTypeId;
+ }
+
+ public String getManualFlag() {
+ return manualFlag;
+ }
+
+ public void setManualFlag(String manualFlag) {
+ this.manualFlag = manualFlag;
+ }
+
+ public String getUploadedFlag() {
+ return uploadedFlag;
+ }
+
+ public void setUploadedFlag(String uploadedFlag) {
+ this.uploadedFlag = uploadedFlag;
+ }
+
+ public Date getValidTo() {
+ return validTo;
+ }
+
+ public void setValidTo(Date validTo) {
+ this.validTo = validTo;
+ }
+
+ public Date getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(Date createDate) {
+ this.createDate = createDate;
+ }
+
+ public String getCreatedBy() {
+ return createdBy;
+ }
+
+ public void setCreatedBy(String createdBy) {
+ this.createdBy = createdBy;
+ }
+
+ public Date getUpdateDate() {
+ return updateDate;
+ }
+
+ public void setUpdateDate(Date updateDate) {
+ this.updateDate = updateDate;
+ }
+
+ public String getUpdateBy() {
+ return updateBy;
+ }
+
+ public void setUpdateBy(String updateBy) {
+ this.updateBy = updateBy;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/xujie/sys/modules/srm/entity/SrmSupplier.java b/src/main/java/com/xujie/sys/modules/srm/entity/SrmSupplier.java
index 427b7a00..b02f1aef 100644
--- a/src/main/java/com/xujie/sys/modules/srm/entity/SrmSupplier.java
+++ b/src/main/java/com/xujie/sys/modules/srm/entity/SrmSupplier.java
@@ -58,6 +58,57 @@ public class SrmSupplier extends QueryPage {
*
*/
private String updateBy;
+ private String supplierDocType;
+ // 税号
+ private String taxCode;
+
+ // 传真
+ private String faxNo;
+
+ // 电话
+ private String phoneNo;
+
+ // 联系人
+ private String contact;
+
+ // 地址
+ private String address;
+
+ // 付款条件
+ private String paymentTerm;
+
+ // 交货条件
+ private String deliveryTerm;
+
+ // 采购员
+ private String buyer;
+
+ // 币种
+ private String currency;
+
+ // ABC分类
+ private String abc;
+
+ // 是否激活
+ private String active;
+
+ // 银行名称
+ private String bankName;
+
+ // 银行账号
+
+ private String bankAccount;
+
+ // 税务编号
+
+ private String taxNo;
+
+ // 邮箱
+
+ private String email;
+
+ //备注
+ private String memo;
}
\ No newline at end of file
diff --git a/src/main/resources/mapper/srm/SrmSupplierMapper.xml b/src/main/resources/mapper/srm/SrmSupplierMapper.xml
index 96090c0f..8e3837da 100644
--- a/src/main/resources/mapper/srm/SrmSupplierMapper.xml
+++ b/src/main/resources/mapper/srm/SrmSupplierMapper.xml
@@ -4,7 +4,9 @@