ufo / yohoufo-fore · Commits

18 Sep, 2018

2 commits

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

by mali
2018-09-18 09:34:20 +0800
Browse Files
context修改
4f6acd0b

by mali
2018-09-18 09:34:14 +0800
Browse Files

17 Sep, 2018

38 commits

u
3ca7b054

by ken.hu
2018-09-17 22:18:07 +0800
Browse Files
fix
91c7d3b3

by sailing-PC\sailing
2018-09-17 21:40:31 +0800
Browse Files
ss
ea7065c2

by sailing-PC\sailing
2018-09-17 21:09:19 +0800
Browse Files
fix
4e04f166

by sailing-PC\sailing
2018-09-17 21:08:25 +0800
Browse Files
resource
560668cb

by ken.hu
2018-09-17 21:02:42 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore ...
a70d93d3
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/constants/MetaKey.java
```
by tanling
2018-09-17 20:21:48 +0800
Browse Files
提交订单
ecd620d3

by tanling
2018-09-17 20:21:20 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore
97af6c06

by Lixiaodi
2018-09-17 20:09:29 +0800
Browse Files
修改返回参数
17720d84

by Lixiaodi
2018-09-17 20:09:20 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore
c1bea03e

by mali
2018-09-17 19:01:48 +0800
Browse Files
context修改
a0949d74

by mali
2018-09-17 19:01:42 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore
ab718fbf

by sailing-PC\sailing
2018-09-17 18:34:10 +0800
Browse Files
fix
aaffcb9a

by sailing-PC\sailing
2018-09-17 18:33:54 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore
f5cdbd7f

by tanling
2018-09-17 18:12:23 +0800
Browse Files
no message
0573cd76

by tanling
2018-09-17 18:12:19 +0800
Browse Files
no message
e678de02

by tanling
2018-09-17 17:48:36 +0800
Browse Files
Merge branch 'master' into dev-inbox-20180911 ...
7b6c83ae
```
# Conflicts:
#	web/src/main/resources/databases.yml
```
by csgyoho
2018-09-17 17:43:27 +0800
Browse Files
no message
5ecf58bf

by tanling
2018-09-17 17:39:02 +0800
Browse Files
no message
1485700b

by csgyoho
2018-09-17 17:38:50 +0800
Browse Files
配置环境
ca85f969

by tanling
2018-09-17 17:37:58 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore ...
bdc19ee8
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/SellerOrderService.java
#	product/src/main/java/com/yohoufo/product/controller/ProductController.java
```
by tanling
2018-09-17 17:33:35 +0800
Browse Files
支付接口提供
aaf9a2e6

by tanling
2018-09-17 17:29:20 +0800
Browse Files
resource
15b9fafd

by ken.hu
2018-09-17 17:04:43 +0800
Browse Files
增加数据库yml
dcc1adbf

by Lixiaodi
2018-09-17 16:55:07 +0800
Browse Files
no message
7b8097ab

by csgyoho
2018-09-17 16:47:59 +0800
Browse Files
add
f026893e

by sailing-PC\sailing
2018-09-17 16:43:13 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore
be7d46a1

by Lixiaodi
2018-09-17 16:24:18 +0800
Browse Files
修改去除缓存
ab4db551

by Lixiaodi
2018-09-17 16:24:06 +0800
Browse Files
storage related
aadf5a6c

by zhaojun2
2018-09-17 16:21:57 +0800
Browse Files
更新db
83019093

by qinchao
2018-09-17 15:56:25 +0800
Browse Files
no message
ae10f9fe

by csgyoho
2018-09-17 15:42:46 +0800
Browse Files
修改缓存可以删除
1e2a4bfb

by Lixiaodi
2018-09-17 15:40:17 +0800
Browse Files
resource
1b6f42ac

by ken.hu
2018-09-17 15:07:57 +0800
Browse Files
修改缓存可以删除
7d97f510

by Lixiaodi
2018-09-17 15:04:36 +0800
Browse Files
no message
7c8f7744

by csgyoho
2018-09-17 14:49:17 +0800
Browse Files
bug fix
45661c63

by zhaojun2
2018-09-17 14:27:46 +0800
Browse Files
添加brand和筛选接口
a870c460

by zhaojun2
2018-09-17 14:05:57 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore
7f0385f3

by Lixiaodi
2018-09-17 12:41:54 +0800
Browse Files