From a9bb3348487c4a75c6a74a4d84f3a8afe9858d0c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 19 Dec 2020 15:53:24 +0800
Subject: [PATCH] Merge branch 'ty_urgent' into test
---
zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
index 09060f2..31bf0dc 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
@@ -86,6 +86,12 @@
<result property="goodsSortName" column="goodsSortName" />
+ <result property="payMethods" column="pay_methods" />
+ <result property="invalidTime" column="invalid_time" />
+ <result property="useValid" column="use_valid" />
+ <result property="buyValid" column="buy_valid" />
+ <result property="isInfinite" column="is_infinite" />
+
</resultMap>
@@ -290,7 +296,12 @@
use_shop,
headquarters,
is_del,
- zjm
+ zjm,
+ buy_valid,
+ use_valid,
+ invalid_time,
+ pay_methods,
+ is_infinite
)
VALUES (
#{id},
@@ -346,7 +357,12 @@
#{useShop},
#{headquarters},
#{isDel},
- #{zjm}
+ #{zjm},
+ #{buyValid},
+ #{useValid},
+ #{invalidTime},
+ #{payMethods},
+ #{isInfinite}
)
</insert>
@@ -519,8 +535,13 @@
<if test="isDel != null and isDel !='' ">
is_del = #{isDel},
</if>
-
-
+ <if test="isInfinite != null and isInfinite !='' ">
+ is_infinite = #{isInfinite},
+ </if>
+ invalid_time = #{invalidTime},
+ buy_valid = #{buyValid},
+ use_valid = #{useValid},
+ pay_methods = #{payMethods},
</set>
WHERE id=#{id}
</update>
--
Gitblit v1.9.1