ufo / ufo-platform · Commits

20 Jun, 2019

7 commits

Merge branch 'test6.9.7' of http://git.yoho.cn/ufo/ufo-platform into test6.9.7 ...
d24b2cb8
```
# Conflicts:
#	dal/src/main/resources/META-INF/mybatis/SellerOrderGoodsMapper.xml
#	order/src/main/java/com/yoho/ufo/order/service/impl/BuyerOrderServiceImpl.java
```
by caoyan
2019-06-20 15:43:41 +0800
Browse Files
增加香港现货
f407f5f0

by caoyan
2019-06-20 15:36:21 +0800
Browse Files
香港直邮
76f9d121

by mali
2019-06-20 14:40:56 +0800
Browse Files
Merge branch 'master' into test6.9.7
dbebaff9

by mali
2019-06-20 14:13:06 +0800
Browse Files
二手库存优化
0c9215ba

by mali
2019-06-20 14:02:57 +0800
Browse Files
香港直邮
e532a118

by mali
2019-06-20 11:41:38 +0800
Browse Files
香港直邮
ad213292

by mali
2019-06-20 11:36:42 +0800
Browse Files

19 Jun, 2019

10 commits

砍价优化
35eabd98

by mali
2019-06-19 17:19:22 +0800
Browse Files
refactor
053642f9

by LUOXC
2019-06-19 17:13:33 +0800
Browse Files
二手库存优化
3b623f13

by mali
2019-06-19 15:21:53 +0800
Browse Files
二手库存优化
3d672404

by mali
2019-06-19 15:08:17 +0800
Browse Files
二手库存优化
780727e1

by mali
2019-06-19 13:46:11 +0800
Browse Files
Merge branch 'gray' into test6.9.7
3e47fe42

by mali
2019-06-19 09:58:06 +0800
Browse Files
优惠券优化
f890c2e7

by mali
2019-06-19 09:56:26 +0800
Browse Files
Merge branch 'gray' into test6.9.7
39cbb9b5

by mali
2019-06-19 09:49:20 +0800
Browse Files
版本升级到15.0
0a7a64cb

by mali
2019-06-19 09:48:50 +0800
Browse Files
rename
9d5cab9b

by LUOXC
2019-06-19 09:45:05 +0800
Browse Files

18 Jun, 2019

6 commits

优惠券优化
0e048f8c

by mali
2019-06-18 18:51:50 +0800
Browse Files
优惠券优化
6da8be6e

by mali
2019-06-18 18:28:00 +0800
Browse Files
二手库存优化
217ef537

by mali
2019-06-18 17:15:32 +0800
Browse Files
fixbug
c7b96743

by LUOXC
2019-06-18 15:54:05 +0800
Browse Files
建议价9结尾
fcd56c2a

by caoyan
2019-06-18 14:09:05 +0800
Browse Files
修改按钮颜色
0199289a

by caoyan
2019-06-18 10:23:07 +0800
Browse Files

15 Jun, 2019

1 commit

订单排序优化
8eb04ab6

by mali
2019-06-15 22:02:52 +0800
Browse Files

14 Jun, 2019

13 commits

Merge branch 'test6.9.6' of http://git.yoho.cn/ufo/ufo-platform into test6.9.6
17d39e9f

by mali
2019-06-14 17:09:12 +0800
Browse Files
Merge branch 'master' into test6.9.6
4d69bd7e

by mali
2019-06-14 17:09:08 +0800
Browse Files
Merge branch 'test6.9.6' of http://git.yoho.cn/ufo/ufo-platform into test6.9.6
26fa3b1b

by caoyan
2019-06-14 16:39:20 +0800
Browse Files
Merge branch 'dev_鉴定优化_20190611' into test6.9.6
8d243ca1

by caoyan
2019-06-14 16:39:16 +0800
Browse Files
排序
925f868e

by caoyan
2019-06-14 16:39:01 +0800
Browse Files
超时时间20分钟
87a4a8f9

by mali
2019-06-14 16:09:00 +0800
Browse Files
Merge branch 'dev_鉴定优化_20190611' into test6.9.6
5ec1cd6c

by caoyan
2019-06-14 15:17:46 +0800
Browse Files
运单截屏
21de8298

by caoyan
2019-06-14 15:17:36 +0800
Browse Files
Merge branch 'dev_鉴定优化_20190611' into test6.9.6
0ee7fe15

by caoyan
2019-06-14 14:50:47 +0800
Browse Files
托寄物名称
74c704f0

by caoyan
2019-06-14 14:50:30 +0800
Browse Files
超时时间5分钟
c45dcec4

by mali
2019-06-14 14:44:19 +0800
Browse Files
update
7bbacc54

by 邱骏
2019-06-14 14:25:46 +0800
Browse Files
修改bug
a6268873

by 邱骏
2019-06-14 14:25:18 +0800
Browse Files

13 Jun, 2019

3 commits

refacot
37425b61

by LUOXC
2019-06-13 16:17:29 +0800
Browse Files
添加银行卡选项
c5c06ba3

by LUOXC
2019-06-13 15:46:13 +0800
Browse Files
fixbug
2de74aa8

by LUOXC
2019-06-13 15:20:13 +0800
Browse Files