productDev/dingyuannongji.git

			@@ -550,7 +550,7 @@
			*/
			public enum OrderStatus{
			WAIT_PAY(0, "待支付", "待支付"),
			PAY_DONE(1, "待发货", "已支付代发货"),
			PAY_DONE(1, "待发货", "已支付待发货"),
			WAIT_RECEIVE(2, "待收货", "已发货待收货"),
			DONE(3, "交易完成", "交易完成"),
			CLOSE(4, "已关闭", "已关闭"),
			@@ -914,7 +914,8 @@
			DARENTANDIANTYPE(11, "达人探店分类", "达人探店分类"),
			HOMEZHUANQU(12, "首页专区", "首页专区"),
			BIG_AREA(13, "区域分类", "区域分类"),

			APPLICABLE_BRAND(14, "适用品牌", "适用品牌"),
			SERIES_BRAND(15, "系列品牌", "系列品牌"),
			;
			// 成员变量
			private String name;