ufo / ufo-platform · Commits

19 Sep, 2018

9 commits

Merge branch 'master' of http://git.yoho.cn/ufo/ufo-platform
02b6f116

by mali
2018-09-19 10:57:02 +0800
Browse Files
库存管理
f146bbed

by mali
2018-09-19 10:56:50 +0800
Browse Files
Merge remote-tracking branch 'origin/master'
a79b9aae

by kun
2018-09-19 10:52:32 +0800
Browse Files
修改查询字段
c83e3755

by kun
2018-09-19 10:52:19 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/ufo-platform
67788c61

by Lixiaodi
2018-09-19 10:50:10 +0800
Browse Files
bug修改
28411453

by Lixiaodi
2018-09-19 10:49:55 +0800
Browse Files
库存管理
b7ca0ac1

by mali
2018-09-19 10:46:39 +0800
Browse Files
库存管理
489a0c17

by mali
2018-09-19 09:52:11 +0800
Browse Files
库存管理
94a2fec0

by mali
2018-09-19 09:44:24 +0800
Browse Files

18 Sep, 2018

31 commits

bug修改
40573807

by Lixiaodi
2018-09-19 02:41:12 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/ufo-platform
14c1ff99

by Lixiaodi
2018-09-18 19:29:17 +0800
Browse Files
修改bug
24ae9f21

by Lixiaodi
2018-09-18 19:29:07 +0800
Browse Files
库存管理
89c10526

by mali
2018-09-18 19:18:53 +0800
Browse Files
库存管理
4128b4d6

by mali
2018-09-18 19:13:22 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/ufo-platform ...
c6e8787f
```
Conflicts:
	dal/src/main/java/com/yoho/ufo/dal/ProductMapper.java
	dal/src/main/resources/META-INF/mybatis/ProductMapper.xml
```
by mali
2018-09-18 17:49:58 +0800
Browse Files
库存管理
c44384c5

by mali
2018-09-18 17:48:30 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/ufo-platform ...
cea552d3
```
# Conflicts:
#	dal/src/main/resources/META-INF/mybatis/UfoSizeMapper.xml
```
by Lixiaodi
2018-09-18 17:25:04 +0800
Browse Files
修改mapper xml错误
af22cefe

by Lixiaodi
2018-09-18 17:23:21 +0800
Browse Files
修改mapper报错
1c7237b4

by kun
2018-09-18 16:56:02 +0800
Browse Files
修改mapper报错
a2e41d11

by kun
2018-09-18 16:52:01 +0800
Browse Files
Merge remote-tracking branch 'origin/master'
8e8c85b7

by kun
2018-09-18 16:02:12 +0800
Browse Files
删除冗余代码
8e7e0621

by kun
2018-09-18 16:02:06 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/ufo-platform
14937cf9

by Lixiaodi
2018-09-18 15:44:40 +0800
Browse Files
商品管理
d0eb109f

by Lixiaodi
2018-09-18 15:44:28 +0800
Browse Files
Merge remote-tracking branch 'origin/master'
bc880e1c

by kun
2018-09-18 15:31:25 +0800
Browse Files
删除冗余代码
b2204db7

by kun
2018-09-18 15:31:16 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/ufo-platform
5b332846

by Lixiaodi
2018-09-18 14:41:25 +0800
Browse Files
商品管理
47f0aac9

by Lixiaodi
2018-09-18 14:41:08 +0800
Browse Files
update
9f02605e

by kun
2018-09-18 14:37:30 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/ufo-platform ...
e2da6f7c
```
# Conflicts:
#	pom.xml
```
by caoyan
2018-09-18 14:22:36 +0800
Browse Files
订单管理
3404dc83

by caoyan
2018-09-18 14:21:39 +0800
Browse Files
库存管理
9d11b0f9

by mali
2018-09-18 14:17:46 +0800
Browse Files
update
877e9a11

by kun
2018-09-18 14:02:18 +0800
Browse Files
库存管理
c6b96199

by mali
2018-09-18 13:57:40 +0800
Browse Files
订单管理
ca37f334

by caoyan
2018-09-18 11:37:56 +0800
Browse Files
Merge branch 'master' of http://git.yoho.cn/ufo/ufo-platform
12ea986f

by caoyan
2018-09-18 11:32:17 +0800
Browse Files
订单管理
77f72172

by caoyan
2018-09-18 11:32:06 +0800
Browse Files
增加下载模版
c2e400a7

by kun
2018-09-18 11:27:11 +0800
Browse Files
update
02795d9f

by kun
2018-09-18 11:16:23 +0800
Browse Files
update
274c9381

by kun
2018-09-18 09:45:45 +0800
Browse Files