From fa791f7796c1546b1329b52a3de8d753915cb4d5 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 00:24:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml |    2 ++
 1 files changed, 2 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 295413f..d49243d 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
@@ -896,6 +896,7 @@
             <result property="timeLength" column="proj_time_length"/>
             <result property="img" column="proj_img"/>
             <result property="projId" column="proj_projId"/>
+            <result property="status" column="proj_status"/>
         </collection>
     </resultMap>
 
@@ -911,6 +912,7 @@
             e.SURPLUS_COUNT proj_SURPLUS_COUNT,
             e.id proj_info_id,
             e.proj_id proj_projId,
+            e.status proj_status,
             f.time_length proj_time_length,
             f.img proj_img
         from sys_proj_use a

--
Gitblit v1.9.1