ufo / yohoufo-fore · Commits

18 Sep, 2018

40 commits

fix
1065f110

by sailing-PC\sailing
2018-09-18 17:59:31 +0800
Browse Files
add sql
77c31ce5

by zhaojun2
2018-09-18 17:20:52 +0800
Browse Files
bugfix
36553ec1

by zhaojun2
2018-09-18 17:19:48 +0800
Browse Files
Merge branch 'dev' of http://git.yoho.cn/ufo/yohoufo-fore into dev ...
0482d06b
```
* 'dev' of http://git.yoho.cn/ufo/yohoufo-fore:
  add definition
```
by zhaojun2
2018-09-18 17:17:54 +0800
Browse Files
bug fix
f47e26d4

by zhaojun2
2018-09-18 17:17:42 +0800
Browse Files
Merge branch 'dev' of http://git.yoho.cn/ufo/yohoufo-fore into dev
b655688b

by sailing-PC\sailing
2018-09-18 17:15:47 +0800
Browse Files
add definition
0162412c

by sailing-PC\sailing
2018-09-18 17:15:23 +0800
Browse Files
bug fix
b06fc2f6

by zhaojun2
2018-09-18 17:15:07 +0800
Browse Files
实名认证接口-开启图形验证码
fa26f5e1

by qinchao
2018-09-18 16:52:00 +0800
Browse Files
optimized code
1a17f8d6

by sailing-PC\sailing
2018-09-18 15:58:29 +0800
Browse Files
optimized
fb129355

by sailing-PC\sailing
2018-09-18 15:25:53 +0800
Browse Files
实名认证接口-开启图形验证码
02fd7032

by qinchao
2018-09-18 15:07:55 +0800
Browse Files
Merge branch 'master' into dev
9bfeefc4

by sailing-PC\sailing
2018-09-18 15:04:17 +0800
Browse Files
fix
b42c1b27

by sailing-PC\sailing
2018-09-18 15:03:49 +0800
Browse Files
fix
3a145841

by sailing-PC\sailing
2018-09-18 15:02:24 +0800
Browse Files
Merge branch 'dev'
81f55d56

by mali
2018-09-18 14:34:15 +0800
Browse Files
ff
7bfe990f

by sailing-PC\sailing
2018-09-18 14:33:35 +0800
Browse Files
订单列表
f0d8d1a1

by tanling
2018-09-18 14:29:57 +0800
Browse Files
Merge branch 'dev' of http://git.yoho.cn/ufo/yohoufo-fore into dev
b384924b

by csgyoho
2018-09-18 14:26:10 +0800
Browse Files
完善inbox
d6d40993

by csgyoho
2018-09-18 14:25:33 +0800
Browse Files
Merge branch 'dev' of http://git.yoho.cn/ufo/yohoufo-fore into dev
d3349fdd

by sailing-PC\sailing
2018-09-18 14:17:54 +0800
Browse Files
fix
50a7b89b

by sailing-PC\sailing
2018-09-18 14:17:33 +0800
Browse Files
Merge branch 'dev' of http://git.yoho.cn/ufo/yohoufo-fore into dev ...
4bd94e46
```
* 'dev' of http://git.yoho.cn/ufo/yohoufo-fore:
  fix
```
by zhaojun2
2018-09-18 14:16:58 +0800
Browse Files
去掉mock数据
c1e76771

by zhaojun2
2018-09-18 14:16:38 +0800
Browse Files
fix
122761ad

by sailing-PC\sailing
2018-09-18 14:09:56 +0800
Browse Files
bug fix
b86025a4

by zhaojun2
2018-09-18 13:58:25 +0800
Browse Files
product detail
503bae91

by zhaojun2
2018-09-18 13:46:51 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore ...
c8c1cc81
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/impl/BuyerOrderServiceImpl.java
```
by tanling
2018-09-18 11:44:11 +0800
Browse Files
no message
d76ea8a3

by tanling
2018-09-18 11:43:27 +0800
Browse Files
no message
ebc9fba6

by tanling
2018-09-18 11:43:18 +0800
Browse Files
update
f340a2de

by ken.hu
2018-09-18 11:43:17 +0800
Browse Files
Merge branch 'dev_authorize' into dev
3d95ac4e

by qinchao
2018-09-18 11:12:20 +0800
Browse Files
实名认证接口-开启图形验证码
5f75c322

by qinchao
2018-09-18 11:11:32 +0800
Browse Files
u
ec49bdb9

by ken.hu
2018-09-18 10:52:28 +0800
Browse Files
Merge branch 'dev-inbox-20180911' into dev
f2e92ba7

by csgyoho
2018-09-18 10:33:07 +0800
Browse Files
no message
49b9b237

by csgyoho
2018-09-18 10:32:27 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore ...
87a9de2c
```
# Conflicts:
#	dal/src/main/java/com/yohoufo/dal/product/StorageMapper.java
```
by Lixiaodi
2018-09-18 09:57:10 +0800
Browse Files
增加库存操作
0b6b9224

by Lixiaodi
2018-09-18 09:55:06 +0800
Browse Files
Merge branch 'dev_passport_auth'
9c6f1486

by qinchao
2018-09-18 09:42:22 +0800
Browse Files
实名认证接口-开启图形验证码
78df982c

by qinchao
2018-09-18 09:40:11 +0800
Browse Files