From ba7ef6a2cfeff873da48469cc775c5f928ea45e8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 30 Nov 2021 17:19:38 +0800
Subject: [PATCH] Merge branch 'ty_fix' into score_shop

---
 zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
index 957d259..17b4ddf 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
@@ -892,6 +892,8 @@
         <collection property="taocanProjUse" ofType="com.matrix.system.hive.bean.SysProjUse">
             <id property="id" column="proj_info_id" />
             <result property="projName" column="proj_proj_name"/>
+            <result property="source" column="proj_source"/>
+            <result property="price" column="proj_price"/>
             <result property="failTime" column="proj_FAIL_TIME"/>
             <result property="surplusCount" column="proj_SURPLUS_COUNT"/>
             <result property="timeLength" column="proj_time_length"/>
@@ -913,6 +915,8 @@
             e.SURPLUS_COUNT proj_SURPLUS_COUNT,
             e.id proj_info_id,
             e.proj_id proj_projId,
+            e.source proj_source,
+            e.price proj_price,
             e.status proj_status,
             f.time_length proj_time_length,
             f.img proj_img

--
Gitblit v1.9.1