Merge remote-tracking branch 'origin/master'

admin

2019-05-27 4218d7978f7954b07228136722438ba1256dbed2

Merge remote-tracking branch 'origin/master'

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/activity/RecommendActivityTaoBaoGoodsMapper.java

@@ -25,7 +25,6 @@

    int updateStateByAuctionId(@Param("auctionId") Long auctionId, @Param("state") int state);

    List<TaoBaoGoodsBrief> getTaoBaoGoodsBriefByActivityId(Long activityId);

    List<RecommendActivityTaoBaoGoods> selectByActivityId(Long activityId);
    

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

@@ -39,15 +39,9 @@
        <include refid="Base_Column_List" />
        from yeshi_ec_activity_goods_taobao limit #{start},#{count}
    </select>
    <select id="getTaoBaoGoodsBriefByActivityId" resultMap="TAOBAOGOODS"
        parameterType="java.lang.Long">SELECT g.* FROM yeshi_ec_activity_goods_taobao t LEFT
        JOIN yeshi_ec_taobao_goods g ON t.`agt_goods_id`=g.`id` WHERE
        t.`agt_activity_id`=#{0}
    </select>
    <select id="selectByActivityId" resultMap="BaseResultMap"
        parameterType="java.lang.Long">SELECT t.* FROM yeshi_ec_activity_goods_taobao t LEFT
        JOIN yeshi_ec_taobao_goods g ON t.`agt_goods_id`=g.`id` WHERE
        t.`agt_activity_id`=#{0}
    <select id="selectByActivityId" resultMap="BaseResultMap" parameterType="java.lang.Long">
        SELECT t.* FROM yeshi_ec_activity_goods_taobao t 
        WHERE t.`agt_activity_id`=#{0}
    </select>

    <select id="selectByAuctionId" resultMap="BaseResultMap"