ufo / yohoufo-fore · Commits

14 Feb, 2019

5 commits

Merge branch 'master' into test6.8.6 ...
a8f199c3
```
Conflicts:
	web/src/main/resources/global.properties
```
by mali
2019-02-14 14:24:39 +0800
Browse Files
发货超时时间修改为36小时
099644c1

by mali
2019-02-14 14:23:48 +0800
Browse Files
Merge branch 'hotfix_超时' into gray
8749a47b

by mali
2019-02-14 10:30:43 +0800
Browse Files
Merge branch 'hotfix_超时' into test6.8.6
275a1f2a

by qinchao
2019-02-14 10:20:56 +0800
Browse Files
修改默认的生效时间为2月15凌晨
d67d4587

by qinchao
2019-02-14 10:09:55 +0800
Browse Files

13 Feb, 2019

10 commits

Merge branch 'dev_物权转移' into test6.8.6
5cb43a98

by caoyan
2019-02-13 17:00:41 +0800
Browse Files
物权转移
46cd7a06

by caoyan
2019-02-13 17:00:23 +0800
Browse Files
Merge branch 'dev-grass-0108' into test6.8.6
16917cc8

by 张帅
2019-02-13 16:38:08 +0800
Browse Files
提供接口_种草相关
609f60bf

by 张帅
2019-02-13 16:37:27 +0800
Browse Files
物权转移
7966834b

by caoyan
2019-02-13 16:11:48 +0800
Browse Files
支持再次入驻
5738f450

by Lixiaodi
2019-02-13 15:13:15 +0800
Browse Files
支持再次入驻
0f10a9ff

by Lixiaodi
2019-02-13 15:09:18 +0800
Browse Files
Merge branch 'dev_物权转移' into test6.8.6
e9133496

by caoyan
2019-02-13 10:05:45 +0800
Browse Files
物权转移
58d8d737

by caoyan
2019-02-13 10:05:26 +0800
Browse Files
预售价
9be23270

by Lixiaodi
2019-02-13 09:57:12 +0800
Browse Files

12 Feb, 2019

5 commits

Merge branch 'dev_物权转移' into test6.8.6 ...
8ffe9d98
```
# Conflicts:
#	web/src/main/resources/databases.yml
#	web/src/main/webapp/META-INF/autoconf/databases.yml
```
by caoyan
2019-02-12 17:50:50 +0800
Browse Files
fix-bug : enterTime model 为long ，更新时把入驻时间都更新为0了
ec45268d

by qinchao
2019-02-12 15:15:59 +0800
Browse Files
物权转移
43fff1d6

by caoyan
2019-02-12 15:05:55 +0800
Browse Files
crm发券topic修改
7447688d

by tanling
2019-02-12 14:53:11 +0800
Browse Files
Merge branch 'master' into hotfix_0131_minifaultZero
7967c3f6

by LUOXC
2019-02-12 11:20:19 +0800
Browse Files

11 Feb, 2019

1 commit

物权转移
8c30add1

by caoyan
2019-02-11 18:36:14 +0800
Browse Files

02 Feb, 2019

11 commits

物权转移
d91ab5b0

by caoyan
2019-02-02 18:13:40 +0800
Browse Files
物权转移
73946eea

by caoyan
2019-02-02 16:55:59 +0800
Browse Files
Merge branch 'hotfix_超时' into test6.8.6
664fc76d

by qinchao
2019-02-02 16:26:46 +0800
Browse Files
fix 系统发布后，队列新的时候生效之前，原消费队列必须有
6b173121

by qinchao
2019-02-02 16:21:52 +0800
Browse Files
Merge branch 'hotfix_超时' into test6.8.6
fb83d921

by qinchao
2019-02-02 15:43:31 +0800
Browse Files
fix
3cc5a637

by qinchao
2019-02-02 15:38:53 +0800
Browse Files
fix 展示
dc9f8444

by qinchao
2019-02-02 15:32:18 +0800
Browse Files
fix缓存刷新时间
accb0a53

by qinchao
2019-02-02 15:20:16 +0800
Browse Files
fix bug
863e79d3

by qinchao
2019-02-02 15:15:44 +0800
Browse Files
fix 配置
0f478eb8

by qinchao
2019-02-02 14:37:35 +0800
Browse Files
Merge branch 'master' into test6.8.6
2e777f70

by mali
2019-02-02 09:33:37 +0800
Browse Files

01 Feb, 2019

8 commits

Merge branch 'dev_order_6.8.6' into test6.8.6
db3c675c

by chenchao
2019-02-01 18:15:53 +0800
Browse Files
compute by skup type
c589162a

by chenchao
2019-02-01 18:14:20 +0800
Browse Files
support advance product
a84222ca

by chenchao
2019-02-01 16:36:15 +0800
Browse Files
Merge branch 'dev_虚假发货消息队列' into test6.8.6
0813650a

by qinchao
2019-02-01 16:21:35 +0800
Browse Files
fix 注释
a62d09d8

by qinchao
2019-02-01 16:21:17 +0800
Browse Files
Merge branch 'master' into dev_批量导入
1aecd304

by mali
2019-02-01 16:07:00 +0800
Browse Files
optimized compute seller goods fee
a2a71479

by chenchao
2019-02-01 15:49:32 +0800
Browse Files
Merge branch 'dev_虚假发货消息队列' into test6.8.6
d31e8970

by qinchao
2019-02-01 15:38:09 +0800
Browse Files