Merge branch 'master' into div

yujian

2019-07-11 e4a56b57d3e10b9b46eaefe5194bbf98fcc45698

 fanli/src/main/java/com/yeshi/fanli/mapping/goods/CollectionGoodsV2Mapper.xml

@@ -69,7 +69,7 @@
      g.cg_goods_id=#{goodsId} 
      limit 1
   </select>
	

   
   <select id="selectByUidAndGoodsType" resultMap="BaseResultMap">
      select    v2.* from yeshi_ec_collection_goods_v2 v2 
@@ -79,6 +79,7 @@
      limit 1
   </select>
   

   <select id="getByUidAndCommonId" resultMap="BaseResultMap">
      select v2.* from yeshi_ec_collection_goods_v2 v2 
      where v2.cg_uid   = #{uid} and v2.cg_common_goods_id = #{commonId}