~jiangyouyao/beauty-erp.git

			@@ -33,6 +33,11 @@
			private Integer count;


			/**
			* 退款数量
			*/
			private Integer refundCount;


			/**
			* 是否为赠送和是否
			@@ -87,11 +92,8 @@
			* 欠款金额
			*/
			private Double arrears;




			//页面参数使用

			/**
			* 付款方式
			*/
			@@ -108,8 +110,7 @@
			*/
			private Long cardId;




			/**
			* 是否为综合卡创建的订单明细
			* 1是
			@@ -159,6 +160,14 @@
			return preCount;
			}

			public Integer getRefundCount() {
			return refundCount;
			}

			public void setRefundCount(Integer refundCount) {
			this.refundCount = refundCount;
			}

			public void setPreCount(int preCount) {
			this.preCount = preCount;
			}
			@@ -182,14 +191,15 @@
			/**
			* 业绩计算
			*/
			private List<AchieveNew> achaeveList;
			private List<AchieveNew> achieveList;

			public List<AchieveNew> getAchaeveList() {
			return achaeveList;

			public List<AchieveNew> getAchieveList() {
			return achieveList;
			}

			public void setAchaeveList(List<AchieveNew> achaeveList) {
			this.achaeveList = achaeveList;
			public void setAchieveList(List<AchieveNew> achieveList) {
			this.achieveList = achieveList;
			}

			public String getPayMethodDetail() {