Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsInstance.java
===================================================================
diff -u -r21678 -r21771
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsInstance.java	(.../ExpensiveGoodsInstance.java)	(revision 21678)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsInstance.java	(.../ExpensiveGoodsInstance.java)	(revision 21771)
@@ -78,6 +78,9 @@
 
 	private Long warehouseID;// 仓库ID
 	private String warehouseName;// 仓库名字
+	
+	private Long supplierId;// 供应商ID
+	private String supplierName;// 供应商名字
 
 	private Long invoiceItemId;// 明细汇总的Id
 	private Long invoiceId;// 发货单Id
@@ -184,6 +187,22 @@
 		this.model = model;
 	}
 
+	public Long getSupplierId() {
+		return supplierId;
+	}
+
+	public void setSupplierId(Long supplierId) {
+		this.supplierId = supplierId;
+	}
+
+	public String getSupplierName() {
+		return supplierName;
+	}
+
+	public void setSupplierName(String supplierName) {
+		this.supplierName = supplierName;
+	}
+
 	public Long getExpensiveGoodsModelStockId() {
 		return expensiveGoodsModelStockId;
 	}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsGodownEntryItem.java
===================================================================
diff -u -r21678 -r21771
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsGodownEntryItem.java	(.../ExpensiveGoodsGodownEntryItem.java)	(revision 21678)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsGodownEntryItem.java	(.../ExpensiveGoodsGodownEntryItem.java)	(revision 21771)
@@ -77,7 +77,7 @@
 	/**
 	 * 供应商id
 	 */
-	private String supplierId;
+	private Long supplierId;
 
 	/**
 	 * 供应商名称
@@ -87,7 +87,7 @@
 	/**
 	 * 生产厂家id
 	 */
-	private String manufacturerId;
+	private Long manufacturerId;
 	
 	/**
 	 * 生产厂家名称
@@ -187,14 +187,7 @@
 		this.certification = certification;
 	}
 
-	public String getSupplierId() {
-		return supplierId;
-	}
 
-	public void setSupplierId(String supplierId) {
-		this.supplierId = supplierId;
-	}
-
 	public String getFirstBodyCode() {
 		return firstBodyCode;
 	}
@@ -315,20 +308,28 @@
 		this.expensiveGoodsModelStockId = expensiveGoodsModelStockId;
 	}
 
-	public String getManufacturerId() {
-		return manufacturerId;
-	}
-
-	public void setManufacturerId(String manufacturerId) {
-		this.manufacturerId = manufacturerId;
-	}
-
 	public String getManufacturerName() {
 		return manufacturerName;
 	}
 
 	public void setManufacturerName(String manufacturerName) {
 		this.manufacturerName = manufacturerName;
 	}
+
+	public Long getSupplierId() {
+		return supplierId;
+	}
+
+	public void setSupplierId(Long supplierId) {
+		this.supplierId = supplierId;
+	}
+
+	public Long getManufacturerId() {
+		return manufacturerId;
+	}
+
+	public void setManufacturerId(Long manufacturerId) {
+		this.manufacturerId = manufacturerId;
+	}
 	
 }