ufo / yohoufo-fore · Commits

28 May, 2019

2 commits

测试环境的 mq 时间修改，测试完之后需要revert
eb98d8aa

by qinchao
2019-05-28 10:20:37 +0800
Browse Files
Revert "测试：测试环境的mq时间，测试完之后再改过了" ...
a4931268
```
This reverts commit ad08f990.
```
by qinchao
2019-05-28 10:12:13 +0800
Browse Files

27 May, 2019

15 commits

Merge branch 'test6.9.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.5
4af853f4

by caoyan
2019-05-27 17:57:33 +0800
Browse Files
自助尺码
8872d215

by caoyan
2019-05-27 17:57:24 +0800
Browse Files
#可以自助上架尺码的一级品类配置
07f81a8d

by mali
2019-05-27 17:20:20 +0800
Browse Files
Merge branch 'test6.9.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.5
9d8cdb46

by mali
2019-05-27 17:15:55 +0800
Browse Files
Merge branch 'master' into test6.9.5
bdedda70

by mali
2019-05-27 17:15:51 +0800
Browse Files
测试：测试环境的mq时间，测试完之后再改过了
ad08f990

by qinchao
2019-05-27 16:47:38 +0800
Browse Files
增加log
80f33d46

by Lixiaodi
2019-05-27 16:16:20 +0800
Browse Files
Merge branch 'hotfix-0527' into test6.9.5 ...
998accb2
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/impl/PaymentServiceImpl.java
```
by Lixiaodi
2019-05-27 15:22:53 +0800
Browse Files
增加log
1e0d9b1f

by Lixiaodi
2019-05-27 15:16:35 +0800
Browse Files
bug修改
9ba9415e

by Lixiaodi
2019-05-27 14:50:56 +0800
Browse Files
Merge branch 'test6.9.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.5
3c1dd440

by caoyan
2019-05-27 14:44:19 +0800
Browse Files
添加尺码
8ac3b1f3

by caoyan
2019-05-27 14:44:10 +0800
Browse Files
1
a0cd115e

by Lixiaodi
2019-05-27 14:09:36 +0800
Browse Files
optimized
5bc382aa

by chenchao
2019-05-27 11:44:29 +0800
Browse Files
清理不必要的代码
0804c010

by mali
2019-05-27 10:42:26 +0800
Browse Files

25 May, 2019

3 commits

Merge branch 'dev_bargain' into test6.9.5
7ca063db

by wujiexiang
2019-05-25 13:09:18 +0800
Browse Files
方法重命名
ac88539c

by wujiexiang
2019-05-25 13:09:06 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore into dev_bargain
c632ec03

by wujiexiang
2019-05-25 13:06:12 +0800
Browse Files

24 May, 2019

20 commits

Merge branch 'hotfix_出售商品最低价提示' into test6.9.5 ...
e8755ac5
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/impl/SellerOrderListService.java
```
by chenchao
2019-05-24 16:53:55 +0800
Browse Files
4 high level promotion
c45408e9

by chenchao
2019-05-24 16:38:39 +0800
Browse Files
Merge branch 'test6.9.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.5
8bfd50c5

by caoyan
2019-05-24 16:38:07 +0800
Browse Files
添加尺码
13fc3972

by caoyan
2019-05-24 16:37:59 +0800
Browse Files
Merge branch 'dev_bargain' into test6.9.5
85c22891

by wujiexiang
2019-05-24 16:26:26 +0800
Browse Files
边界问题处理
f08b48b1

by wujiexiang
2019-05-24 16:26:14 +0800
Browse Files
Merge branch 'test6.9.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.5
38c1f7f3

by chenchao
2019-05-24 14:17:26 +0800
Browse Files
4 high level promotion
87863299

by chenchao
2019-05-24 14:17:17 +0800
Browse Files
Merge branch 'dev_bargain' into test6.9.5
5bee9326

by wujiexiang
2019-05-24 11:44:26 +0800
Browse Files
砍价 -- 异常告警
7499dc07

by wujiexiang
2019-05-24 11:43:38 +0800
Browse Files
4 high level promotion
75d6b999

by chenchao
2019-05-24 11:36:21 +0800
Browse Files
4 high level promotion
e047f236

by chenchao
2019-05-24 11:36:03 +0800
Browse Files
添加尺码
7e8dcc73

by caoyan
2019-05-24 11:02:17 +0800
Browse Files
Merge branch 'test6.9.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.5
32920f99

by caoyan
2019-05-24 11:00:58 +0800
Browse Files
添加尺码
78ae2461

by caoyan
2019-05-24 11:00:49 +0800
Browse Files
Merge branch 'dev_bargain' into test6.9.5
15fbe4ad

by wujiexiang
2019-05-24 10:27:55 +0800
Browse Files
ufo砍价
e1145d4d

by wujiexiang
2019-05-24 10:26:56 +0800
Browse Files
fix bug ：买家未付款结束前5分钟提醒
04f89d71

by qinchao
2019-05-24 10:20:44 +0800
Browse Files
Merge branch 'test6.9.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.5 ...
5e625c8f
```
# Conflicts:
#	product/src/main/java/com/yohoufo/product/service/ProductService.java
```
by caoyan
2019-05-24 10:17:43 +0800
Browse Files
添加尺码
2a346d7e

by caoyan
2019-05-24 10:15:49 +0800
Browse Files