platform / platform-cms · Commits

23 May, 2019

2 commits

Merge branch 'master' into test6.9.5
898ab1da

by LUOXC
2019-05-23 10:59:17 +0800
Browse Files
1
c5416d1b

by LUOXC
2019-05-23 10:58:56 +0800
Browse Files

22 May, 2019

9 commits

爬虫管理页面优化
236cbe91

by liangyi.chen@yoho.cn
2019-05-22 18:33:24 +0800
Browse Files
查询列表接口优化，增加日志
0f393f36

by 张帅
2019-05-22 18:06:03 +0800
Browse Files
no message
b50d0cec

by tanling
2019-05-22 16:01:00 +0800
Browse Files
Merge branch 'test6.9.5' of http://git.yoho.cn/platform/platform-cms into test6.9.5
5c96b5a5

by tanling
2019-05-22 15:40:25 +0800
Browse Files
拼团订单发券配置
1e3998f0

by tanling
2019-05-22 15:40:22 +0800
Browse Files
Merge branch 'test6.9.4' into test6.9.5
8e676d89

by liangyi.chen@yoho.cn
2019-05-22 15:14:40 +0800
Browse Files
页面修改为弹框
043b1b57

by liangyi.chen@yoho.cn
2019-05-22 15:14:24 +0800
Browse Files
修复草稿箱bug
fb7f2912

by 张帅
2019-05-22 10:05:31 +0800
Browse Files
fix
a7105af4

by 张帅
2019-05-22 09:47:43 +0800
Browse Files

21 May, 2019

9 commits

升级依赖版本
19b670cf

by 张帅
2019-05-21 18:38:35 +0800
Browse Files
页面bug修复
73f3a9b4

by liangyi.chen@yoho.cn
2019-05-21 17:33:46 +0800
Browse Files
Merge
c8dfded9

by 张帅
2019-05-21 17:26:43 +0800
Browse Files
fix
ac41d4fe

by 张帅
2019-05-21 17:25:27 +0800
Browse Files
Merge branch 'test6.9.4' of http://git.yoho.cn/platform/platform-cms into test6.9.4
9f3fb4c1

by mlge
2019-05-21 16:06:19 +0800
Browse Files
种草--文章详情页支持展示长文章
aa976e84

by mlge
2019-05-21 16:06:15 +0800
Browse Files
长文章草稿箱调整
1821fd48

by 张帅
2019-05-21 11:41:58 +0800
Browse Files
fix
e2cf1133

by 张帅
2019-05-21 11:28:34 +0800
Browse Files
长文章调整
75ee20fb

by 张帅
2019-05-21 11:03:40 +0800
Browse Files

20 May, 2019

11 commits

接口增校验
fd7fb461

by 张帅
2019-05-20 18:39:23 +0800
Browse Files
爬虫页面优化
189d7706

by liangyi.chen@yoho.cn
2019-05-20 18:23:18 +0800
Browse Files
更改路径
9777dd29

by 张帅
2019-05-20 17:39:47 +0800
Browse Files
Merge
f35fa720

by 张帅
2019-05-20 17:04:53 +0800
Browse Files
Merge branch 'dev-grass-longArticle' into test6.9.4 ...
ce044062
```
# Conflicts:
#	grass/src/main/java/com/yohobuy/platform/grass/service/impl/GrassArticleServiceImpl.java
#	operations/pom.xml
#	pom.xml
```
by 张帅
2019-05-20 17:04:20 +0800
Browse Files
增加文章类型--爬虫数据
1d63ca63

by liangyi.chen@yoho.cn
2019-05-20 16:56:48 +0800
Browse Files
fix bug
e53db818

by liangyi.chen@yoho.cn
2019-05-20 16:30:15 +0800
Browse Files
Merge branch 'master' into dev-grass-longArticle ...
5378593c
```
# Conflicts:
#	grass/src/main/java/com/yohobuy/platform/grass/service/impl/GrassArticleServiceImpl.java
#	operations/pom.xml
#	pom.xml
```
by 张帅
2019-05-20 15:04:10 +0800
Browse Files
爬虫数据更新
e8464c84

by liangyi.chen@yoho.cn
2019-05-20 14:47:13 +0800
Browse Files
pom升级6.9.4
c2634c46

by liangyi.chen@yoho.cn
2019-05-20 13:35:19 +0800
Browse Files
Merge branch 'dev-grasstblcrawerinfo' into test6.9.4
a377bff3

by liangyi.chen@yoho.cn
2019-05-20 10:36:39 +0800
Browse Files

17 May, 2019

1 commit

Merge branch 'test6.9.3' into gray
5b4fa953

by chaogeng
2019-05-17 11:28:50 +0800
Browse Files

16 May, 2019

8 commits

fix
4fb1fc86

by 张帅
2019-05-16 20:45:29 +0800
Browse Files
更改话题上传图片接口
afbb15ce

by 张帅
2019-05-16 20:39:31 +0800
Browse Files
更改话题上传图片接口
25a27bb3

by 张帅
2019-05-16 20:32:59 +0800
Browse Files
Merge branch 'test6.9.3' into gray
0320a5e5

by chaogeng
2019-05-16 19:29:02 +0800
Browse Files
Merge branch 'test6.9.3' of http://git.yoho.cn/platform/platform-cms into test6.9.3 ...
67df6725
```
# Conflicts:
#	grass/src/main/java/com/yohobuy/platform/grass/restapi/CMSHtmlController.java
```
by chaogeng
2019-05-16 19:27:41 +0800
Browse Files
删除无用代码
9271c7ec

by chaogeng
2019-05-16 19:26:11 +0800
Browse Files
种草--用户身份认证修改
e3fd58a3

by mlge
2019-05-16 17:22:16 +0800
Browse Files
种草
1172f104

by mlge
2019-05-16 16:39:18 +0800
Browse Files