~jiangyouyao/beauty-erp.git

			@@ -18,6 +18,7 @@
			<result property="freeConsume" column="free_consume" />
			<result property="hisConsume" column="his_consume" />
			<result property="goodsCash" column="goods_cash" />
			<result property="cardCash" column="card_cash" />
			<result property="projNum" column="proj_num" />
			<result property="numberOfPeople" column="number_of_people" />
			<result property="shopName" column="shop_name" />
			@@ -66,7 +67,6 @@
			c.vip_name,
			e.name as pro_name,
			b.ZK_TOTAL as zk_total,
			a.goods_cash,
			a.his_consume,
			a.free_consume,
			f.su_name meiliao,
			@@ -79,6 +79,8 @@
			h.shop_short_name shop_name,
			a.order_type,
			a.achieveType,
			case when a.pay_method = '现金' then goods_cash end goods_cash,
			case when a.pay_method = '划扣' then goods_cash end card_cash,
			j.pay_method
			from
			achieve_new a