~jiangyouyao/beauty-erp.git

			@@ -64,10 +64,13 @@
			private Integer score;

			/**
			* 积分兑换价格
			* 积分兑换所需支付金额
			*/
			private Integer scorePrice;

			private BigDecimal scorePrice;
			/**
			* 积分兑换所需支付积分
			*/
			private Integer scoreCount;


			/**
			@@ -96,6 +99,15 @@

			@Extend
			private String goodsName;


			public Integer getScoreCount() {
			return scoreCount;
			}

			public void setScoreCount(Integer scoreCount) {
			this.scoreCount = scoreCount;
			}

			public BigDecimal getSealesPrice() {
			return sealesPrice;
			@@ -256,11 +268,11 @@
			this.goodsName = goodsName;
			}

			public Integer getScorePrice() {
			public BigDecimal getScorePrice() {
			return scorePrice;
			}

			public void setScorePrice(Integer scorePrice) {
			public void setScorePrice(BigDecimal scorePrice) {
			this.scorePrice = scorePrice;
			}