From aaeaded75d418e6582c16ebd983fe6b052b889b8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 11 Dec 2020 14:27:59 +0800
Subject: [PATCH] Merge branch 'master' into ty_urgent
---
zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml | 20 ++++++++++----------
1 files changed, 10 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..6c35040 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,11 @@
<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" />
+
</resultMap>
@@ -293,7 +298,8 @@
zjm,
buy_valid,
use_valid,
- invalid_time
+ invalid_time,
+ pay_methods
)
VALUES (
#{id},
@@ -352,7 +358,8 @@
#{zjm},
#{buyValid},
#{useValid},
- #{invalidTime}
+ #{invalidTime},
+ #{payMethods}
)
</insert>
@@ -525,17 +532,10 @@
<if test="isDel != null and isDel !='' ">
is_del = #{isDel},
</if>
- <if test="invalidTime != null">
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