ufo / yohoufo-fore · Commits

29 May, 2019

6 commits

解绑支付宝接口 for platform
cc260f48

by qinchao
2019-05-29 17:57:21 +0800
Browse Files
Revert "测试环境的 mq 时间修改，测试完之后需要revert" ...
079dc3da
```
This reverts commit eb98d8aa.
```
by qinchao
2019-05-29 16:47:48 +0800
Browse Files
optimized ,and prepare 4 split
a17ae873

by chenchao
2019-05-29 15:22:34 +0800
Browse Files
Merge branch 'master' into test6.9.5
94507324

by chenchao
2019-05-29 10:57:50 +0800
Browse Files
fix : format null 2 number
24d5fc39

by chenchao
2019-05-29 10:53:21 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore
0032b057

by chenchao
2019-05-29 10:28:18 +0800
Browse Files

28 May, 2019

15 commits

Merge branch 'hotfix_0528_blacklistAndCouponType' into test6.9.5
555e9c1e

by tanling
2019-05-28 20:30:23 +0800
Browse Files
no message
06672e7b

by tanling
2019-05-28 20:30:11 +0800
Browse Files
Merge branch 'hotfix_0528_blacklistAndCouponType' into test6.9.5 ...
29c13e5e
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/impl/ShoppingServiceImpl.java
```
by tanling
2019-05-28 19:44:43 +0800
Browse Files
优惠券skp类型匹配
d51b14f0

by tanling
2019-05-28 19:43:44 +0800
Browse Files
Merge branch 'hotfix_0528_blacklistAndCouponType' into test6.9.5 ...
e3a08568
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/impl/ShoppingServiceImpl.java
```
by tanling
2019-05-28 18:03:29 +0800
Browse Files
黑名单拦截
26211d31

by tanling
2019-05-28 18:01:28 +0800
Browse Files
拦截黑名单
a770633c

by tanling
2019-05-28 18:00:23 +0800
Browse Files
自助尺码
6ecc2ccd

by caoyan
2019-05-28 17:10:46 +0800
Browse Files
自助尺码站内信
9c46e2b5

by caoyan
2019-05-28 16:41:58 +0800
Browse Files
自助尺码
5a15109f

by caoyan
2019-05-28 16:19:20 +0800
Browse Files
自助尺码
160f1b9f

by caoyan
2019-05-28 16:14:11 +0800
Browse Files
Merge branch 'test6.9.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.5
f09a39d4

by caoyan
2019-05-28 14:12:06 +0800
Browse Files
缓存
609f7a67

by caoyan
2019-05-28 14:11:58 +0800
Browse Files
测试环境的 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

1 commit

Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore
d8366a04

by chenchao
2019-05-24 17:19:04 +0800
Browse Files