Merge branch 'master' of http://git.iamberry.com/liuzhiwei/iamberry-common-tooth

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/apparatus/Apparatus.java

@@ -22,6 +22,8 @@ public class Apparatus implements java.io.Serializable{
     private Date apparatusWarrantyDate; //保修截止日期
     private Date apparatusCreateTime;   //创建时间
 
+    private Integer colorId;    //颜色id
+
     private PageBean page;			//分页
 
     public Integer getStoreId() {