fanli-server.git

返利

Merge remote-tracking branch 'origin/master'

yujian

2019-07-10 6b1a7a75b06eafb0bbf7f20d950384a3fde4c8ef

refs
用户	yujian <yujian@123.com>
	星期三, 七月 10, 2019 17:27 +0800
提交者	yujian <yujian@123.com>
	星期三, 七月 10, 2019 17:27 +0800
提交	6b1a7a75b06eafb0bbf7f20d950384a3fde4c8ef
目录	e583fedb5d7dea84d3ae3019ce04df82dd91efa4 目录 \| zip \| gz
parent	080518784b436d11dc281353b8e4c218141b0906 查看 \| 对比 a4cc097c7a5bd6a0b8397fb232484df9e01ed4f8 查看 \| 对比

Merge remote-tracking branch 'origin/master'

Conflicts:
	fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
	fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java
	fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoUtil.java

3个文件已修改

	fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java	189 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java	235 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoUtil.java	58 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史