ufo / yohoufo-fore · Commits

17 Jan, 2019

23 commits

Merge branch 'test6.8.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.5
3f5f9180

by chenjian
2019-01-17 15:21:23 +0800
Browse Files
消息盒子-跳转规则
ecf50e92

by csgyoho
2019-01-17 15:20:56 +0800
Browse Files
Merge branch 'test6.8.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.5
c7366495

by chenjian
2019-01-17 15:20:54 +0800
Browse Files
Merge branch 'dev-offline-buy' into test6.8.5 ...
965d0b2a
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/model/response/OfflinePaymentResponse.java
```
by chenjian
2019-01-17 15:20:48 +0800
Browse Files
fix
4bb50ffc

by qinchao
2019-01-17 15:17:49 +0800
Browse Files
门店订单收货人
1713e049

by chenjian
2019-01-17 15:09:50 +0800
Browse Files
change datatype
2c7e7258

by chenchao
2019-01-17 15:06:40 +0800
Browse Files
add buyer order list num
2901d355

by chenchao
2019-01-17 15:03:56 +0800
Browse Files
Merge branch 'test6.8.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.5
7192e77a

by mali
2019-01-17 14:55:07 +0800
Browse Files
价格趋势去重操作
9f960754

by mali
2019-01-17 14:55:02 +0800
Browse Files
物流fix
f58c4e94

by qinchao
2019-01-17 14:51:49 +0800
Browse Files
fix
4be2875c

by chenchao
2019-01-17 14:50:20 +0800
Browse Files
消息盒子-跳转规则
57851dd4

by csgyoho
2019-01-17 14:40:02 +0800
Browse Files
optimized log detail
dfaf506f

by chenchao
2019-01-17 13:37:28 +0800
Browse Files
fix 物流阶段
c4d7c672

by qinchao
2019-01-17 11:39:51 +0800
Browse Files
fix common charge back process
d13a3362

by chenchao
2019-01-17 11:00:53 +0800
Browse Files
mq 时间设置
a6c87c04

by qinchao
2019-01-17 10:51:02 +0800
Browse Files
修复消息
87dea64a

by qinchao
2019-01-17 10:36:35 +0800
Browse Files
fix bug
170b6bfd

by qinchao
2019-01-17 10:28:33 +0800
Browse Files
门店购买提示
294235ee

by chenjian
2019-01-17 10:21:45 +0800
Browse Files
买家结算提示
dff9df93

by chenjian
2019-01-17 10:20:20 +0800
Browse Files
Merge branch 'hotfix_隐藏真实库存' into test6.8.5 ...
5678185c
```
Conflicts:
	product/src/main/java/com/yohoufo/product/service/impl/ProductServiceImpl.java
```
by mali
2019-01-17 10:11:21 +0800
Browse Files
测试延时mq
cb9567f6

by qinchao
2019-01-17 09:58:40 +0800
Browse Files

16 Jan, 2019

17 commits

消息
4634ba7c

by qinchao
2019-01-16 19:03:15 +0800
Browse Files
Merge branch 'test6.8.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.5
36c4cc92

by Lixiaodi
2019-01-16 18:21:16 +0800
Browse Files
允许充值恢复商品
8a635c0b

by Lixiaodi
2019-01-16 18:21:08 +0800
Browse Files
消息
0ce05d22

by qinchao
2019-01-16 18:19:56 +0800
Browse Files
发消息
ec8b1fa0

by qinchao
2019-01-16 17:17:12 +0800
Browse Files
搜索增加有货商品
fa43ccc4

by caoyan
2019-01-16 17:04:56 +0800
Browse Files
消息发送
beeb1593

by qinchao
2019-01-16 17:02:29 +0800
Browse Files
修改物流提示
f117c573

by qinchao
2019-01-16 16:31:22 +0800
Browse Files
add cached ...
91d57602
```
fix nullpoint
```
by chenchao
2019-01-16 16:19:26 +0800
Browse Files
add cache
a3af3ea7

by chenchao
2019-01-16 16:01:55 +0800
Browse Files
平台收货：发消息
0bf89a54

by qinchao
2019-01-16 15:37:01 +0800
Browse Files
鉴定视频排序展示
fa4724b9

by mali
2019-01-16 15:19:49 +0800
Browse Files
鉴定视频排序展示
ade780e3

by mali
2019-01-16 15:13:21 +0800
Browse Files
更新状态
797d80ac

by qinchao
2019-01-16 14:49:07 +0800
Browse Files
change http path
acfe40e7

by chenchao
2019-01-16 13:54:40 +0800
Browse Files
optimized super level
038f6f61

by chenchao
2019-01-16 13:52:40 +0800
Browse Files
change 4 unit test
03ea4631

by chenchao
2019-01-16 11:59:00 +0800
Browse Files