Merge branch 'ty_urgent' into test

Helius

2020-12-19 a9bb3348487c4a75c6a74a4d84f3a8afe9858d0c

 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>