ufo / ufo-platform · Commits

22 Nov, 2018

11 commits

Merge branch 'dev-resources-20181116' into test6.8.2
99de2257

by csgyoho
2018-11-22 16:05:50 +0800
Browse Files
no message
794e880e

by csgyoho
2018-11-22 16:05:38 +0800
Browse Files
Merge branch 'dev-resources-20181116' into test6.8.2
54ca5aef

by csgyoho
2018-11-22 15:42:00 +0800
Browse Files
no message
4df7fb86

by csgyoho
2018-11-22 15:41:34 +0800
Browse Files
no message
2ea3637e

by csgyoho
2018-11-22 15:21:13 +0800
Browse Files
Merge branch 'dev-resources-20181116' into test6.8.2
f13498b7

by csgyoho
2018-11-22 15:08:40 +0800
Browse Files
no message
3f7d7074

by csgyoho
2018-11-22 15:08:27 +0800
Browse Files
Merge branch 'dev-resources-20181116' into test6.8.2
df7afe11

by csgyoho
2018-11-22 14:37:25 +0800
Browse Files
no message
8a5853cb

by csgyoho
2018-11-22 14:37:11 +0800
Browse Files
Merge branch 'dev-resources-20181116' into test6.8.2
5b62fcb6

by csgyoho
2018-11-22 13:59:02 +0800
Browse Files
no message
846c4e1a

by csgyoho
2018-11-22 13:57:51 +0800
Browse Files

21 Nov, 2018

3 commits

Merge branch 'dev-resources-20181116' into test6.8.2 ...
b1cb79c6
```
# Conflicts:
#	web/src/main/webapp/META-INF/autoconf/databases.yml
```
by csgyoho
2018-11-21 14:06:17 +0800
Browse Files
no message
96ebd67f

by csgyoho
2018-11-21 14:01:06 +0800
Browse Files
增加忽略编译后文件目录
005ee4b0

by mali
2018-11-21 10:37:34 +0800
Browse Files

20 Nov, 2018

10 commits

no message
24ca8e13

by csgyoho
2018-11-20 20:21:49 +0800
Browse Files
no message
d24b8d4c

by csgyoho
2018-11-20 20:19:22 +0800
Browse Files
Merge branch 'gray' into test6.8.2
2f08ec73

by mali
2018-11-20 16:36:47 +0800
Browse Files
Merge branch 'dev_productmerge' into gray
78c130cc

by mali
2018-11-20 15:40:04 +0800
Browse Files
no message
a1d4cfc3

by csgyoho
2018-11-20 10:49:42 +0800
Browse Files
Merge branch 'test6.8.2' of http://git.yoho.cn/ufo/ufo-platform into test6.8.2 ...
e1247d37
```
# Conflicts:
#	web/src/main/webapp/META-INF/autoconf/databases.yml
```
by csgyoho
2018-11-20 09:53:21 +0800
Browse Files
Merge branch 'dev-resources-20181116' into test6.8.2 ...
23aa9bcb
```
# Conflicts:
#	web/src/main/webapp/META-INF/autoconf/databases.yml
```
by csgyoho
2018-11-20 09:51:44 +0800
Browse Files
Merge branch 'dev_reback' into test6.8.2
b19382ae

by qinchao
2018-11-20 09:51:32 +0800
Browse Files
Merge branch 'test' into test6.8.2 ...
5ccb9ae1
```
# Conflicts:
#	web/src/main/resources/databases.yml
#	web/src/main/webapp/META-INF/autoconf/databases.yml
```
by qinchao
2018-11-20 09:50:26 +0800
Browse Files
no message
feaaa6c3

by csgyoho
2018-11-20 09:50:22 +0800
Browse Files

19 Nov, 2018

11 commits

Merge branch 'dev-resources-20181116' of http://git.yoho.cn/ufo/ufo-platform int… ...
2dc4820a
```
…o dev-resources-20181116
```
by htoooth
2018-11-19 19:25:06 +0800
Browse Files
add
95400a01

by htoooth
2018-11-19 19:24:57 +0800
Browse Files
no message
14344bdb

by csgyoho
2018-11-19 18:08:42 +0800
Browse Files
no message
1ab23fdc

by csgyoho
2018-11-19 17:52:48 +0800
Browse Files
no message
774335a9

by csgyoho
2018-11-19 17:18:09 +0800
Browse Files
no message
15256ffe

by csgyoho
2018-11-19 17:15:54 +0800
Browse Files
Merge branch 'dev-resources-20181116' into test6.8.2
896da47c

by csgyoho
2018-11-19 16:57:50 +0800
Browse Files
no message
1ee21c7e

by csgyoho
2018-11-19 16:56:57 +0800
Browse Files
Merge branch 'dev-resources-20181116' into test6.8.2
f125b4cd

by csgyoho
2018-11-19 16:27:37 +0800
Browse Files
no message
74afc8f2

by csgyoho
2018-11-19 16:23:58 +0800
Browse Files
版本升级
6bb387bc

by mali
2018-11-19 10:26:59 +0800
Browse Files

16 Nov, 2018

2 commits

no message
34bf0eab

by csgyoho
2018-11-16 18:30:00 +0800
Browse Files
no message
37db002d

by csgyoho
2018-11-16 17:28:18 +0800
Browse Files

14 Nov, 2018

1 commit

寄回商品（买家取消，卖家已发货）
d1535de8

by qinchao
2018-11-14 18:20:12 +0800
Browse Files

13 Nov, 2018

2 commits

Merge branch 'dev_productPool_20181106' into test
4f5918be

by caoyan
2018-11-13 14:58:37 +0800
Browse Files
增加商品是否存在的校验
7439dbad

by caoyan
2018-11-13 14:58:23 +0800
Browse Files