From 3895d2c29f62f44d6e154e0055a648e34e0b3470 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 12 Aug 2021 16:00:31 +0800
Subject: [PATCH] 20210812

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

diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopDeliveryInfoDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopDeliveryInfoDao.xml
index 68a6c21..7ee395c 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopDeliveryInfoDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopDeliveryInfoDao.xml
@@ -145,6 +145,9 @@
 			 <if test="(record.shopId!=null and record.shopId!='') or  (record.shopId!='' and record.shopId==0)  ">
 				 and shop_id  = #{record.shopId}
 			 </if>
+			 <if test="(record.companyId!=null and record.companyId!='') or  (record.companyId!='' and record.companyId==0)  ">
+				 and company_id  = #{record.companyId}
+			 </if>
 		</if>
 
 	</sql>
@@ -241,8 +244,8 @@
 			<if test="record.orderId != null ">
 				order_id  = #{record.orderId},
 			</if>
-			<if test="record.receive_id != null ">
-				receive_id  = #{record.receive_id},
+			<if test="record.receiveId != null ">
+				receive_id  = #{record.receiveId},
 			</if>
 			<if test="record.userId != null and record.userId != '' ">
 				user_id  = #{record.userId},

--
Gitblit v1.9.1