Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/goodsstock/GoodsStock.java
===================================================================
diff -u -r12653 -r12665
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/goodsstock/GoodsStock.java	(.../GoodsStock.java)	(revision 12653)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/goodsstock/GoodsStock.java	(.../GoodsStock.java)	(revision 12665)
@@ -19,6 +19,9 @@
 @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
 @JsonFilter("fieldFilter")
 public class GoodsStock {
+	
+	public static final String TYPE_MATERIAL = "材料";
+	public static final String TYPE_TOUSSE = "器械包";
 
 	/**
 	 * id
@@ -63,7 +66,7 @@
 	/**
 	 * 名称(材料则为名称+规格)
 	 */
-	private Long name;
+	private String name;
 	
 	/**
 	 * 数量
@@ -136,11 +139,11 @@
 		this.materialDefinitionId = materialDefinitionId;
 	}
 
-	public Long getName() {
+	public String getName() {
 		return name;
 	}
 
-	public void setName(Long name) {
+	public void setName(String name) {
 		this.name = name;
 	}