ufo / yohoufo-fore · Commits

05 Jun, 2019

14 commits

Merge branch 'dev-coupon-recommend' into test6.9.6
2c2e2eeb

by wujiexiang
2019-06-05 18:29:34 +0800
Browse Files
优惠券优化-券列表
77cc596a

by wujiexiang
2019-06-05 18:28:55 +0800
Browse Files
Merge branch 'dev-coupon-recommend' into test6.9.6
37cc7946

by wujiexiang
2019-06-05 17:57:01 +0800
Browse Files
import package
33d4c852

by wujiexiang
2019-06-05 17:56:48 +0800
Browse Files
Merge branch 'dev-coupon-recommend' into test6.9.6
83a21498

by wujiexiang
2019-06-05 17:53:01 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore into dev-coupon-recommend
a59d44b5

by wujiexiang
2019-06-05 17:50:50 +0800
Browse Files
优惠券优化
bce540d9

by wujiexiang
2019-06-05 17:50:38 +0800
Browse Files
Merge branch 'hotfix_0605' of http://git.yoho.cn/ufo/yohoufo-fore into hotfix_0605
ba9e085c

by LUOXC
2019-06-05 15:03:24 +0800
Browse Files
fix bug
126f558f

by LUOXC
2019-06-05 15:03:03 +0800
Browse Files
fix words
4d925138

by chenchao
2019-06-05 14:57:44 +0800
Browse Files
Merge branch 'hotfix-transfer' into test6.9.6
d7549aa6

by LUOXC
2019-06-05 14:45:12 +0800
Browse Files
no message
7f1b3708

by LUOXC
2019-06-05 14:45:01 +0800
Browse Files
Merge branch 'hotfix-transfer' into test6.9.6
a9304456

by LUOXC
2019-06-05 14:44:01 +0800
Browse Files
解决erpStatusStr为空的情况
5934a5d0

by tanling
2019-06-05 11:33:53 +0800
Browse Files

04 Jun, 2019

10 commits

notice appraise address is Changed
4d3da4b4

by chenchao
2019-06-04 17:26:39 +0800
Browse Files
Merge branch 'gray'
1ef34dd3

by 马力
2019-06-04 15:19:59 +0800
Browse Files
Merge branch 'gray' of http://git.yoho.cn/ufo/yohoufo-fore into gray
fa8f46a8

by 马力
2019-06-04 15:18:43 +0800
Browse Files
资源位缓存
4ae0cb5a

by 马力
2019-06-04 15:17:53 +0800
Browse Files
refactor
4b8ed02b

by LUOXC
2019-06-04 10:43:12 +0800
Browse Files
fix bug
b1f24f1d

by LUOXC
2019-06-04 10:18:04 +0800
Browse Files
Merge branch 'master' into hotfix-transfer
a40501df

by LUOXC
2019-06-04 10:16:28 +0800
Browse Files
Revert "fix bug" ...
17e9b5e2
```
This reverts commit cce52a64.
```
by LUOXC
2019-06-04 10:06:32 +0800
Browse Files
fix bug
cce52a64

by LUOXC
2019-06-04 10:05:21 +0800
Browse Files
refactor
84c0fc14

by LUOXC
2019-06-04 09:48:34 +0800
Browse Files

03 Jun, 2019

11 commits

add log
9be9ea3e

by LUOXC
2019-06-03 20:55:14 +0800
Browse Files
fix bug
3e377023

by LUOXC
2019-06-03 20:38:29 +0800
Browse Files
throw 400
b5881914

by LUOXC
2019-06-03 18:34:16 +0800
Browse Files
add ILLEGAL_DETAIL_FILE_FORMAT
1efe87c3

by LUOXC
2019-06-03 18:26:02 +0800
Browse Files
refactor
353b2a95

by LUOXC
2019-06-03 18:22:55 +0800
Browse Files
refacotr
c0525c72

by LUOXC
2019-06-03 18:10:04 +0800
Browse Files
add log
b81591dc

by LUOXC
2019-06-03 18:01:33 +0800
Browse Files
Merge branch 'test6.9.5' into hotfix-transfer
819b8e62

by LUOXC
2019-06-03 17:30:55 +0800
Browse Files
不允许购买自卖商品
371690cc

by LUOXC
2019-06-03 16:46:38 +0800
Browse Files
限制购买自己销售的商品
6137e9ed

by LUOXC
2019-06-03 16:38:20 +0800
Browse Files
Merge branch 'gray' into hotfix-transfer ...
29b74a37
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/impl/PaymentServiceImpl.java
```
by LUOXC
2019-06-03 14:07:06 +0800
Browse Files

31 May, 2019

5 commits

open支付宝解绑功能 fix
2faf0159

by qinchao
2019-05-31 17:54:28 +0800
Browse Files
open支付宝解绑功能
7b7fb5ef

by qinchao
2019-05-31 17:43:48 +0800
Browse Files
Merge branch 'master' into test6.9.5
dc9de0f4

by mali
2019-05-31 11:21:25 +0800
Browse Files
Merge branch 'test6.9.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.5
39fff45e

by Lixiaodi
2019-05-31 11:04:50 +0800
Browse Files
增加清除缓存
657415d8

by Lixiaodi
2019-05-31 11:04:43 +0800
Browse Files