~jiangyouyao/beauty-erp.git

			@@ -14,7 +14,7 @@
			<result property="orderNo" column="ORDER_NO"/>
			<result property="activity" column="ACTIVITY"/>
			<result property="total" column="TOTAL"/>
			<result property="cashierName" column="cashierName"/>


			<result property="statu" column="STATU"/>
			<result property="zkTotal" column="ZK_TOTAL"/>
			@@ -31,7 +31,7 @@
			<result property="arrears" column="arrears"/>
			<result property="payTime" column="pay_time"/>
			<result property="cashierId" column="cashier_id"/>

			<result property="cashierName" column="cashierName"/>
			<!-- 扩展字段 -->
			<result property="shopName" column="SHOP_NAME"/>
			<result property="shopShortName" column="SHOP_SHORT_NAME"/>
			@@ -347,7 +347,7 @@
			<select id="selectById" resultMap="SysOrderMap">
			select
			a.*,
			c.su_name as STAFF_NAME,
			c.su_name as STAFF_NAME, e.su_name as cashierName,
			d.SHOP_NAME,
			d.shop_short_name,
			b.PHONE,
			@@ -355,6 +355,7 @@
			from sys_order a
			LEFT JOIN sys_vip_info b on b.ID=a.VIP_ID
			left JOIN sys_users c on c.su_id=a.STAFF_ID
			left JOIN sys_users e on e.su_id=a.cashier_id
			left JOIN sys_shop_info d on d.ID=a.SHOP_ID
			where a.id=#{id}
			</select>