From 4c47534eda0702136016312666b46578bfb6368b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 20 Dec 2020 16:30:39 +0800
Subject: [PATCH] Merge branch 'ty_urgent' into test
---
zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 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 fac724e..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>
@@ -293,7 +299,9 @@
zjm,
buy_valid,
use_valid,
- invalid_time
+ invalid_time,
+ pay_methods,
+ is_infinite
)
VALUES (
#{id},
@@ -352,7 +360,9 @@
#{zjm},
#{buyValid},
#{useValid},
- #{invalidTime}
+ #{invalidTime},
+ #{payMethods},
+ #{isInfinite}
)
</insert>
@@ -525,17 +535,13 @@
<if test="isDel != null and isDel !='' ">
is_del = #{isDel},
</if>
- <if test="invalidTime != null">
+ <if test="isInfinite != null and isInfinite !='' ">
+ is_infinite = #{isInfinite},
+ </if>
invalid_time = #{invalidTime},
- </if>
- <if test="buyValid != null and buyValid !='' ">
buy_valid = #{buyValid},
- </if>
- <if test="useValid != null and useValid !='' ">
use_valid = #{useValid},
- </if>
-
-
+ pay_methods = #{payMethods},
</set>
WHERE id=#{id}
</update>
--
Gitblit v1.9.1