ufo / yohoufo-fore · Commits

14 Jan, 2019

3 commits

Merge branch 'test6.8.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.5 ...
f2022f56
```
# Conflicts:
#	web/src/main/resources/databases.yml
#	web/src/main/webapp/META-INF/autoconf/databases.yml
```
by caoyan
2019-01-14 10:46:41 +0800
Browse Files
营业执照
66be0c9d

by caoyan
2019-01-14 10:43:25 +0800
Browse Files
价格走势
17aae51a

by mali
2019-01-14 10:33:43 +0800
Browse Files

11 Jan, 2019

13 commits

参数命名修改一致
ec349af5

by chenjian
2019-01-11 17:01:06 +0800
Browse Files
add apply 2 super enter seller
0deee1fd

by chenchao
2019-01-11 16:43:57 +0800
Browse Files
门店收货地址加areaCode
51c0aee5

by chenjian
2019-01-11 16:23:18 +0800
Browse Files
add func 4 seller
2de267a0

by chenchao
2019-01-11 15:51:24 +0800
Browse Files
Merge branch 'test6.8.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.5
cae240ca

by caoyan
2019-01-11 14:13:02 +0800
Browse Files
搜索增加有货商品
8316eee6

by caoyan
2019-01-11 14:12:42 +0800
Browse Files
add entry seller type
8c73f669

by chenchao
2019-01-11 13:56:54 +0800
Browse Files
修改配置文字
f7fb76e3

by Lixiaodi
2019-01-11 12:24:26 +0800
Browse Files
超级卖家
40c88ef2

by Lixiaodi
2019-01-11 10:32:55 +0800
Browse Files
Merge branch 'test6.8.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.5
b5deb394

by Lixiaodi
2019-01-11 10:21:52 +0800
Browse Files
超级卖家
09b714df

by Lixiaodi
2019-01-11 10:21:40 +0800
Browse Files
价格走势
2c6bdfdb

by mali
2019-01-11 10:14:12 +0800
Browse Files
价格走势
e9c3aa56

by mali
2019-01-11 09:33:28 +0800
Browse Files

10 Jan, 2019

15 commits

finish data config
1c407cd5

by chenchao
2019-01-10 21:28:39 +0800
Browse Files
add apply and process
0e7e214f

by chenchao
2019-01-10 20:04:40 +0800
Browse Files
暂存
a0eefd12

by Lixiaodi
2019-01-10 19:36:20 +0800
Browse Files
超级卖家
c78fda5d

by Lixiaodi
2019-01-10 18:57:54 +0800
Browse Files
Merge branch 'test6.8.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.5
0b7d01c8

by mali
2019-01-10 18:35:49 +0800
Browse Files
价格走势
dde33f00

by mali
2019-01-10 18:35:43 +0800
Browse Files
Merge branch 'test6.8.5' into dev-offline-buy
00fcc40b

by chenjian
2019-01-10 17:11:19 +0800
Browse Files
门店订单支付后即完成
14154ff5

by chenjian
2019-01-10 17:10:29 +0800
Browse Files
Merge branch 'test6.8.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.5 ...
d384baa6
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/impl/SellerOrderCancelService.java
```
by chenchao
2019-01-10 17:08:46 +0800
Browse Files
optimized buyer refund goods amount
82bc231d

by chenchao
2019-01-10 16:58:25 +0800
Browse Files
修改搜索列表、搜索拆封接口
5f2ebfa7

by Lixiaodi
2019-01-10 16:06:17 +0800
Browse Files
Merge branch 'test6.8.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.5
fbacce37

by mali
2019-01-10 14:47:01 +0800
Browse Files
价格走势
939c970d

by mali
2019-01-10 14:46:55 +0800
Browse Files
refactor 发送消息
26d74ceb

by LUOXC
2019-01-10 14:13:41 +0800
Browse Files
虚假发货
a65e644c

by LUOXC
2019-01-10 12:21:15 +0800
Browse Files

09 Jan, 2019

9 commits

refactor transfer type
71f20542

by LUOXC
2019-01-09 21:35:40 +0800
Browse Files
refactor tansfer type
429fbba6

by LUOXC
2019-01-09 21:29:44 +0800
Browse Files
refactor transfer type
32106af2

by LUOXC
2019-01-09 21:12:09 +0800
Browse Files
Merge branch 'test6.8.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.5
d1cc75a4

by LUOXC
2019-01-09 20:58:38 +0800
Browse Files
Merge branch 'dev6.8.5-cancelorder' into test6.8.5
d96a0cc1

by LUOXC
2019-01-09 20:58:20 +0800
Browse Files
refactor
a0ce5a9a

by LUOXC
2019-01-09 20:58:07 +0800
Browse Files
refactor
196b2828

by LUOXC
2019-01-09 20:47:02 +0800
Browse Files
Merge branch 'test6.8.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.5
1339ae3c

by mali
2019-01-09 20:43:32 +0800
Browse Files
价格走势
4ee918c4

by mali
2019-01-09 20:43:29 +0800
Browse Files