ufo / ufo-platform · Commits

12 Jun, 2019

12 commits

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

by caoyan
2019-06-12 16:10:47 +0800
Browse Files
Merge branch 'dev_鉴定优化_20190611' into test6.9.6 ...
a501c49e
```
# Conflicts:
#	dal/src/main/resources/META-INF/mybatis/BuyerOrderMapper.xml
```
by caoyan
2019-06-12 16:10:38 +0800
Browse Files
运单截屏
df2ff988

by caoyan
2019-06-12 16:09:37 +0800
Browse Files
refactor
5d672f6d

by LUOXC
2019-06-12 15:38:29 +0800
Browse Files
Revert "添加手动已付款" ...
88815fb3
```
This reverts commit 94c73015.
```
by LUOXC
2019-06-12 15:24:29 +0800
Browse Files
添加手动已付款
94c73015

by LUOXC
2019-06-12 14:57:52 +0800
Browse Files
Merge branch 'dev_鉴定优化_20190611' into test6.9.6
b8230bd9

by caoyan
2019-06-12 11:09:24 +0800
Browse Files
运单截屏
d7e84ed4

by caoyan
2019-06-12 11:09:09 +0800
Browse Files
Merge branch 'dev_鉴定优化_20190611' into test6.9.6 ...
20b125f1
```
Conflicts:
	web/src/main/resources/databases.yml
	web/src/main/webapp/META-INF/autoconf/databases.yml
```
by mali
2019-06-12 10:56:27 +0800
Browse Files
Merge branch 'dev_鉴定优化_20190611' of http://git.yoho.cn/ufo/ufo-platform into dev_鉴定优化_20190611 ...
7bbca845
```
Conflicts:
	web/src/main/resources/databases.yml
	web/src/main/webapp/META-INF/autoconf/databases.yml
```
by mali
2019-06-12 10:47:16 +0800
Browse Files
鉴定视频优化
8822d809

by mali
2019-06-12 10:46:17 +0800
Browse Files
运单截屏
95e0ef19

by caoyan
2019-06-12 10:14:24 +0800
Browse Files

11 Jun, 2019

2 commits

自助尺码
613799ca

by caoyan
2019-06-11 15:14:32 +0800
Browse Files
自助尺码
dcc8fffb

by caoyan
2019-06-11 14:15:06 +0800
Browse Files

10 Jun, 2019

10 commits

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

by caoyan
2019-06-10 17:07:36 +0800
Browse Files
打印面单
664a7f32

by caoyan
2019-06-10 17:07:28 +0800
Browse Files
update
b05f60d0

by 邱骏
2019-06-10 16:48:43 +0800
Browse Files
update
afb21c41

by 邱骏
2019-06-10 16:47:56 +0800
Browse Files
打印面单
0e30393e

by caoyan
2019-06-10 16:04:58 +0800
Browse Files
Merge branch 'test6.9.6' of http://git.yoho.cn/ufo/ufo-platform into test6.9.6
66a2d269

by caoyan
2019-06-10 13:54:02 +0800
Browse Files
打印面单
71175ad6

by caoyan
2019-06-10 13:53:53 +0800
Browse Files
优惠券功能优化，资源位新增砍价列表
1f596218

by 邱骏
2019-06-10 11:26:37 +0800
Browse Files
Merge branch 'feature/modify-coupon20190604' of http://git.yoho.cn/ufo/ufo-platf… ...
16bf8a2e
```
…orm into feature/modify-coupon20190604
```
by 邱骏
2019-06-10 11:25:07 +0800
Browse Files
资源位新增砍价支持go.bargainlist
d8f9dfb6

by 邱骏
2019-06-10 11:25:01 +0800
Browse Files

06 Jun, 2019

7 commits

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

by caoyan
2019-06-06 17:47:43 +0800
Browse Files
用户注销情况显示
a950beaf

by caoyan
2019-06-06 17:47:32 +0800
Browse Files
券code
740ac91a

by mali
2019-06-06 15:37:41 +0800
Browse Files
券code
6ca48950

by mali
2019-06-06 15:23:23 +0800
Browse Files
券code
021c2a66

by mali
2019-06-06 15:02:33 +0800
Browse Files
Merge branch 'test6.9.6' of http://git.yoho.cn/ufo/ufo-platform into test6.9.6
e4c83649

by 马力
2019-06-06 11:44:13 +0800
Browse Files
版本升级
08d54d66

by 马力
2019-06-06 11:43:50 +0800
Browse Files

05 Jun, 2019

9 commits

后台优惠券优化
b18239c8

by tanling
2019-06-05 16:13:08 +0800
Browse Files
优惠券后台更新
70698321

by tanling
2019-06-05 16:02:24 +0800
Browse Files
Merge branch 'test6.9.6' of http://git.yoho.cn/ufo/ufo-platform into test6.9.6
23de9ea2

by tanling
2019-06-05 15:46:01 +0800
Browse Files
优惠券优化
7898627e

by tanling
2019-06-05 15:45:57 +0800
Browse Files
自助上架增加驳回
fe5348c0

by caoyan
2019-06-05 15:44:53 +0800
Browse Files
建议价9结尾
d1348b70

by caoyan
2019-06-05 15:27:19 +0800
Browse Files
Merge branch 'test6.9.6' of http://git.yoho.cn/ufo/ufo-platform into test6.9.6
b96290e1

by caoyan
2019-06-05 15:18:57 +0800
Browse Files
建议价9结尾
e6a4fb7d

by caoyan
2019-06-05 15:18:46 +0800
Browse Files
优惠券后台优化
c28dc974

by tanling
2019-06-05 15:12:51 +0800
Browse Files