ufo / ufo-platform · Commits

20 Mar, 2019

10 commits

自助上架
75f04362

by caoyan
2019-03-20 16:40:19 +0800
Browse Files
Merge branch 'test6.8.9' of http://git.yoho.cn/ufo/ufo-platform into test6.8.9
40c35c09

by caoyan
2019-03-20 15:23:55 +0800
Browse Files
自助上架
9434ed43

by caoyan
2019-03-20 15:23:47 +0800
Browse Files
Merge branch 'test6.8.9' of http://git.yoho.cn/ufo/ufo-platform into test6.8.9
c0f8fdb2

by mali
2019-03-20 15:14:26 +0800
Browse Files
core版本升级
5289c491

by mali
2019-03-20 15:14:17 +0800
Browse Files
Merge branch 'test6.8.9' of http://git.yoho.cn/ufo/ufo-platform into test6.8.9
5e4b33b2

by Lixiaodi
2019-03-20 15:07:42 +0800
Browse Files
用户货号审核页面
fc2e37a8

by Lixiaodi
2019-03-20 15:07:31 +0800
Browse Files
Merge branch 'dev_master' into test6.8.9 ...
10f41136
```
Conflicts:
	product/src/main/java/com/yoho/ufo/service/impl/ProductServiceImpl.java
```
by mali
2019-03-20 13:57:31 +0800
Browse Files
update webapp
a626e89e

by TaoHuang
2019-03-20 13:46:48 +0800
Browse Files
自助上架
2ea3ec34

by caoyan
2019-03-20 10:34:24 +0800
Browse Files

19 Mar, 2019

6 commits

自助上架
e0aa9250

by caoyan
2019-03-19 19:55:12 +0800
Browse Files
自助上架
66f3b87c

by mali
2019-03-19 17:27:51 +0800
Browse Files
发站内信接口
290bf459

by mali
2019-03-19 17:04:29 +0800
Browse Files
发站内信接口
214349b0

by mali
2019-03-19 16:00:09 +0800
Browse Files
发站内信接口
10d45af5

by mali
2019-03-19 15:34:15 +0800
Browse Files
自助上架
6d232688

by mali
2019-03-19 14:42:19 +0800
Browse Files

18 Mar, 2019

4 commits

Merge branch 'master' into test6.8.8 ...
a240c01b
```
Conflicts:
	pom.xml
	product/src/main/java/com/yoho/ufo/service/impl/ProductServiceImpl.java
```
by mali
2019-03-18 17:06:09 +0800
Browse Files
编辑货号校验修改
5527a045

by Lixiaodi
2019-03-18 16:53:15 +0800
Browse Files
Merge branch 'master' into dev_pay_million
81e7b4c1

by Lixiaodi
2019-03-18 16:51:16 +0800
Browse Files
升级到8.0版本对应6.8.8分支
23b37c1c

by mali
2019-03-18 09:38:23 +0800
Browse Files

14 Mar, 2019

11 commits

支付超过100万转账修改
2eee8cdd

by Lixiaodi
2019-03-14 19:13:00 +0800
Browse Files
Merge branch 'hotfix_video' into test6.8.7
860aef3b

by mali
2019-03-14 15:02:16 +0800
Browse Files
视频录制修改
422343fa

by mali
2019-03-14 15:02:10 +0800
Browse Files
视频录制修改
fda7818d

by mali
2019-03-14 15:01:14 +0800
Browse Files
Merge branch 'test6.8.7' of http://git.yoho.cn/ufo/ufo-platform into test6.8.7
3c639df5

by mali
2019-03-14 14:35:37 +0800
Browse Files
Merge branch 'hotfix_video' into test6.8.7
1e838104

by mali
2019-03-14 14:35:20 +0800
Browse Files
视频录制修改
5c676970

by mali
2019-03-14 14:35:12 +0800
Browse Files
视频录制修改
d7170c28

by mali
2019-03-14 14:34:47 +0800
Browse Files
Revert "瑕疵确认中的超时时间为24小时" ...
3d216134
```
This reverts commit 7ab2a299.
```
by qinchao
2019-03-14 11:19:35 +0800
Browse Files
瑕疵确认中的超时时间为24小时
7ab2a299

by qinchao
2019-03-14 10:08:46 +0800
Browse Files
瑕疵确认中“超时”标记
e17e19a9

by qinchao
2019-03-14 10:04:21 +0800
Browse Files

13 Mar, 2019

9 commits

Merge branch 'hotfix_video' into test6.8.7
d0d788cd

by mali
2019-03-13 19:30:14 +0800
Browse Files
视频录制修改
b910d5ed

by mali
2019-03-13 19:30:08 +0800
Browse Files
Merge branch 'hotfix_video' into test6.8.7
6fece880

by mali
2019-03-13 17:56:51 +0800
Browse Files
视频录制修改
a29dafc0

by mali
2019-03-13 17:56:44 +0800
Browse Files
Merge branch 'hotfix_video' into test6.8.7
99392d18

by mali
2019-03-13 17:44:37 +0800
Browse Files
视频录制修改
a4c5bbe6

by mali
2019-03-13 17:44:31 +0800
Browse Files
Merge branch 'hotfix_video' into test6.8.7
7d85735b

by mali
2019-03-13 17:10:54 +0800
Browse Files
视频录制修改
6503e263

by mali
2019-03-13 17:10:48 +0800
Browse Files
Merge branch 'hotfix_video' into test6.8.7
ef718647

by mali
2019-03-13 16:56:02 +0800
Browse Files