Merge remote-tracking branch 'origin/master'

admin

2019-05-22 9b4bf99c1a30f3a7c2bdd6faba7589ff4f7e48e5

 fanli/src/main/java/com/yeshi/fanli/mapping/user/UserGoodsStorageMapper.xml

@@ -140,9 +140,8 @@
   </select>
   
   
      <update id="updateShareState" parameterType="java.lang.Long">
      <update id="updateShareStateByCommonGoodsId" parameterType="java.lang.Long">
      UPDATE `yeshi_ec_user_goods_storage` ts SET ts.`guc_state` = 1 
      WHERE ts.`guc_common_id` IN
       (SELECT tg.`gu_common_goods_id` FROM yeshi_ec_share_goods_group tg WHERE tg.`gu_record_id` = #{shareId})
        WHERE ts.`guc_common_id` = #{commonGoodsId}
   </update>
</mapper>