ufo / yohoufo-fore · Commits

21 Jan, 2019

1 commit

fix
948d628f

by peuei
2019-01-21 11:13:45 +0800
Browse Files

15 Jan, 2019

1 commit

update
8499919d

by peuei
2019-01-15 18:02:17 +0800
Browse Files

14 Jan, 2019

16 commits

屏幕接口中新增价格走势
a7c33bda

by peuei
2019-01-14 17:04:57 +0800
Browse Files
质检接口
a52566f1

by qinchao
2019-01-14 15:13:25 +0800
Browse Files
Merge branch 'test6.8.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.5
8e355656

by caoyan
2019-01-14 15:05:04 +0800
Browse Files
营业执照
215494a5

by caoyan
2019-01-14 15:04:56 +0800
Browse Files
Merge branch 'master' into test6.8.5
2da79dff

by mali
2019-01-14 14:39:33 +0800
Browse Files
价格走势
8d44f164

by mali
2019-01-14 14:35:52 +0800
Browse Files
Merge branch 'hotfix-session-0114' into gray
52f6ef35

by chaogeng
2019-01-14 14:26:59 +0800
Browse Files
Merge branch 'hotfix-session-0114' into test6.8.5 ...
9fb9a9f6
```
# Conflicts:
#	common/src/main/java/com/yohoufo/common/interceptor/SecurityInterceptor.java
```
by chaogeng
2019-01-14 14:17:08 +0800
Browse Files
兼容处理UFO设置session缓存非数字的情况
4c0f60f4

by chaogeng
2019-01-14 14:13:43 +0800
Browse Files
质检
f67ff818

by qinchao
2019-01-14 14:00:46 +0800
Browse Files
质检
c1cf4509

by qinchao
2019-01-14 13:51:11 +0800
Browse Files
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
Merge branch 'master' into gray
9c15a219

by mali
2019-01-14 10:35:43 +0800
Browse Files
登录超时的问题
1a5d3215

by mali
2019-01-14 10:35:27 +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

9 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