ufo / ufo-platform · Commits

05 Mar, 2020

6 commits

Merge branch 'hotfix-20200304' into test6.9.22
d247e07e

by LUOXC
2020-03-05 13:16:28 +0800
Browse Files
fixbug
17df639a

by LUOXC
2020-03-05 13:15:10 +0800
Browse Files
refactor
26c7ef7a

by LUOXC
2020-03-05 13:12:03 +0800
Browse Files
refactor
d07f4916

by LUOXC
2020-03-05 13:00:38 +0800
Browse Files
Merge branch 'hotfix-20200304' into test6.9.22
9efeca07

by LUOXC
2020-03-05 11:57:06 +0800
Browse Files
fixbug
808b1eee

by LUOXC
2020-03-05 11:56:54 +0800
Browse Files

04 Mar, 2020

24 commits

添加请求注解
1f128822

by wujiexiang
2020-03-04 21:44:37 +0800
Browse Files
add log
899c15c2

by wujiexiang
2020-03-04 21:31:32 +0800
Browse Files
修改参数
bf7fde70

by wujiexiang
2020-03-04 20:57:45 +0800
Browse Files
修改方法返回值
444bb616

by wujiexiang
2020-03-04 17:57:27 +0800
Browse Files
Merge branch 'test6.9.22' of http://git.yoho.cn/ufo/ufo-platform into test6.9.22 ...
41b9f874
```
Conflicts:
	web/src/main/resources/META-INF/spring/spring-webmvc.xml
```
by mali
2020-03-04 17:31:30 +0800
Browse Files
getBrandSeriesByIds 免登陆
0faac31a

by mali
2020-03-04 17:30:46 +0800
Browse Files
Merge branch 'test6.9.22' of http://git.yoho.cn/ufo/ufo-platform into test6.9.22
5f275b01

by wujiexiang
2020-03-04 17:29:47 +0800
Browse Files
内部调用，不需要登录
1f0629db

by wujiexiang
2020-03-04 17:29:33 +0800
Browse Files
前端提交
9b7b4686

by Lixiaodi
2020-03-04 17:29:09 +0800
Browse Files
Merge branch 'test6.9.22' of http://git.yoho.cn/ufo/ufo-platform into test6.9.22
9370d12d

by Lixiaodi
2020-03-04 17:20:07 +0800
Browse Files
拷贝资源位
b22cc317

by Lixiaodi
2020-03-04 17:19:52 +0800
Browse Files
品类、系列返回全路径id
326dc35d

by wujiexiang
2020-03-04 17:12:42 +0800
Browse Files
根据系列查询系列明细
32a6cb44

by mali
2020-03-04 16:12:50 +0800
Browse Files
根据系列查询系列明细
f663f4e3

by mali
2020-03-04 16:12:18 +0800
Browse Files
bug修改
51fea57c

by Lixiaodi
2020-03-04 15:50:21 +0800
Browse Files
增加根据小分类集合查询分类信息
886057d3

by mali
2020-03-04 15:46:23 +0800
Browse Files
增加根据小分类集合查询分类信息
e408041c

by mali
2020-03-04 15:31:03 +0800
Browse Files
资源位定时发布
74a09ab8

by Lixiaodi
2020-03-04 14:53:02 +0800
Browse Files
校验
a80e89de

by wujiexiang
2020-03-04 14:39:17 +0800
Browse Files
修改请求的方法支持
c173f4f2

by mali
2020-03-04 13:48:12 +0800
Browse Files
视频录制的摄像头默认是录制按钮时候的选择的摄像头
5cf95751

by mali
2020-03-04 12:12:34 +0800
Browse Files
视频录制的摄像头默认是录制按钮时候的选择的摄像头
64dac11b

by mali
2020-03-04 11:23:29 +0800
Browse Files
Merge branch 'hotfix-20200304' into test6.9.22
1d6037cb

by LUOXC
2020-03-04 10:30:14 +0800
Browse Files
fixbug
be1ad951

by LUOXC
2020-03-04 10:26:53 +0800
Browse Files

03 Mar, 2020

8 commits

fixbug
93a30d87

by LUOXC
2020-03-03 16:16:37 +0800
Browse Files
fixbug
2a77efb6

by LUOXC
2020-03-03 15:17:48 +0800
Browse Files
refactor
c96e9bfe

by LUOXC
2020-03-03 15:07:12 +0800
Browse Files
添加领取渠道
03a1cbda

by LUOXC
2020-03-03 14:45:24 +0800
Browse Files
Merge branch 'dev-coupon' into test6.9.22
7bbfb45d

by wujiexiang
2020-03-03 13:07:19 +0800
Browse Files
兼容老版本的排除商品类型
50512d03

by wujiexiang
2020-03-03 13:07:06 +0800
Browse Files
Merge branch 'dev-coupon' into test6.9.22
abc60a12

by wujiexiang
2020-03-03 09:49:27 +0800
Browse Files
增加优惠券商品范围
56584eed

by wujiexiang
2020-03-03 09:49:13 +0800
Browse Files

02 Mar, 2020

2 commits

Merge branch 'dev-coupon' into test6.9.22
489493bf

by wujiexiang
2020-03-02 17:50:55 +0800
Browse Files
优惠券扩展商品范围
608cd0c5

by wujiexiang
2020-03-02 17:49:49 +0800
Browse Files