From 7fb8daefab9776720052db58bee680f1ab8bba04 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 11 Mar 2021 14:30:46 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
index 7a5a0e5..b74ebeb 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
@@ -137,7 +137,8 @@
             d.id as pu_id,
             d.SURPLUS_COUNT as pu_SURPLUS_COUNT,
             d.ASSEMBLE_ID as pu_ASSEMBLE_ID,
-            d.price as pu_price
+            d.price as pu_price,
+		    d.taocan_id as pu_taocan_id
 
 
 		from sys_beautician_state a
@@ -410,6 +411,7 @@
     <select id="selectItemDetail" resultType="java.util.HashMap" parameterType="java.util.HashMap">
         select
         f.SHOP_NAME,
+        b.yy_time,
         b.consume_time,
         b.SERVICE_NO,
         d.su_name,
@@ -420,7 +422,8 @@
         a.COUNT,
         h.PRICE,
         h.SOURCE,
-        a.STATE
+        a.STATE,
+        a.extract
         from sys_beautician_state a
         left join sys_proj_services b on a.SERVICES_ID=b.ID
         left join shopping_goods c on a.proj_id=c.id

--
Gitblit v1.9.1