Merge remote-tracking branch 'origin/master'

admin

2018-12-29 117bb1c6a02d99546dd4bf953aeec67b1ab3d94e

 fanli/src/main/java/com/yeshi/fanli/mapping/activity/RecommendActivityTaoBaoGoodsMapper.xml

@@ -100,9 +100,9 @@
         <if test="desc != null">#{desc,jdbcType=VARCHAR},</if>
         <if test="auctionId != null">#{auctionId,jdbcType=VARCHAR},</if>
         <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
         <if test="state != null">#{state,jdbcType=INTEGER}</if>
         <if test="title != null">#{title,jdbcType=VARCHAR}</if>
         <if test="couponAmount != null">#{couponAmount,jdbcType=DECIMAL}</if>
         <if test="state != null">#{state,jdbcType=INTEGER},</if>
         <if test="title != null">#{title,jdbcType=VARCHAR},</if>
         <if test="couponAmount != null">#{couponAmount,jdbcType=DECIMAL},</if>
      </trim>
   </insert>
   <update id="updateByPrimaryKey"