ufo / yohoufo-fore · Commits

02 Feb, 2019

9 commits

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

18 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
Revert "虚假发货mq 时间测试" ...
9da6bded
```
This reverts commit 8a2055c1.
```
by qinchao
2019-02-01 15:31:19 +0800
Browse Files
Merge branch 'dev_虚假发货消息队列' into test6.8.6
f273a0e1

by qinchao
2019-02-01 15:29:34 +0800
Browse Files
虚假发货mq 时间测试
8a2055c1

by qinchao
2019-02-01 15:04:03 +0800
Browse Files
虚假发货时间
7eaba293

by qinchao
2019-02-01 15:02:18 +0800
Browse Files
Merge branch 'dev_虚假发货消息队列' into test6.8.6
8857a04c

by qinchao
2019-02-01 13:46:46 +0800
Browse Files
Merge branch 'hotfix_0131_minifaultZero' into test6.8.6 ...
c802755b
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/impl/AppraiseService.java
```
by qinchao
2019-02-01 09:59:54 +0800
Browse Files
remove useless
cd91ecf4

by chenchao
2019-02-01 09:49:21 +0800
Browse Files
remove useless
a0509892

by chenchao
2019-02-01 09:48:44 +0800
Browse Files
Merge branch 'dev_批量导入' into test6.8.6
25c0de27

by chenchao
2019-02-01 09:42:35 +0800
Browse Files
no need pay
4866f4fc

by chenchao
2019-02-01 09:42:18 +0800
Browse Files

31 Jan, 2019

13 commits

fix
28a5909e

by chenchao
2019-01-31 18:55:57 +0800
Browse Files
扣费金额设置为固定0
94f0653b

by qinchao
2019-01-31 18:52:57 +0800
Browse Files
Merge branch 'dev_批量导入' into test6.8.6
133984e8

by chenchao
2019-01-31 18:52:21 +0800
Browse Files
add sync data
87ba743a

by chenchao
2019-01-31 18:51:44 +0800
Browse Files
处罚保证金
6820fab8

by qinchao
2019-01-31 16:27:01 +0800
Browse Files
保证金扣费
76561a7a

by qinchao
2019-01-31 15:35:59 +0800
Browse Files
瑕疵不接受：扣保证金回滚为 0 元
b93ace09

by qinchao
2019-01-31 15:19:03 +0800
Browse Files
回滚model版本
d53990a2

by qinchao
2019-01-31 15:09:44 +0800
Browse Files
Merge branch 'dev_qc686_瑕疵分等级扣款' into hotfix_0131_瑕疵不接受
c93e58e0

by qinchao
2019-01-31 15:06:11 +0800
Browse Files
Merge branch 'dev_批量导入' into test6.8.6 ...
81fb685f
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/impl/processor/SellerOrderPrepareProcessor.java
```
by chenchao
2019-01-31 15:00:30 +0800
Browse Files
batch import prd
bb0ba0fd

by chenchao
2019-01-31 14:45:58 +0800
Browse Files
虚假发货-系统自动取消
f75f1d40

by qinchao
2019-01-31 14:36:48 +0800
Browse Files
Merge branch 'hotfix_超时' into test6.8.6
84f1efe0

by qinchao
2019-01-31 13:30:36 +0800
Browse Files