YOHOBUY / yohobuy-union · Commits

24 Feb, 2017

8 commits

Merge branch 'master' into fix_0223
81968933

by linlong
2017-02-24 17:16:26 +0800
Browse Files
update
a249f5c0

by zhengwen.ge
2017-02-24 16:02:48 +0800
Browse Files
update
d15a0628

by zhengwen.ge
2017-02-24 14:39:26 +0800
Browse Files
Merge branch 'dev-20170216'
e6d0b0c1

by zhengwen.ge
2017-02-24 13:44:53 +0800
Browse Files
update
711338a6

by zhengwen.ge
2017-02-24 12:17:35 +0800
Browse Files
加日志
73158da6

by zhengwen.ge
2017-02-24 10:49:48 +0800
Browse Files
Merge branch '广点通转化上报' ...
5edb5d0c
```
# Conflicts:
#	web/src/main/resources/databases.yml
#	web/src/main/webapp/META-INF/autoconf/databases.yml
```
by zhengwen.ge
2017-02-24 09:44:03 +0800
Browse Files
广点通转化上报
1391fbcd

by zhengwen.ge
2017-02-24 09:38:45 +0800
Browse Files

23 Feb, 2017

10 commits

Merge branch '智慧推'
171a4472

by zhengwen.ge
2017-02-23 17:54:00 +0800
Browse Files
update
0644b8a0

by zhengwen.ge
2017-02-23 17:42:28 +0800
Browse Files
update
3da1fd0d

by zhengwen.ge
2017-02-23 17:40:43 +0800
Browse Files
update
9ceceae5

by zhengwen.ge
2017-02-23 17:31:17 +0800
Browse Files
Merge branch 'master' into 广点通转化上报
71672d05

by zhengwen.ge
2017-02-23 17:21:12 +0800
Browse Files
update
b9b8b2fc

by zhengwen.ge
2017-02-23 17:20:50 +0800
Browse Files
update
c25b7efb

by linlong
2017-02-23 14:57:02 +0800
Browse Files
广点通上报
78cae9eb

by zhengwen.ge
2017-02-23 11:18:01 +0800
Browse Files
Merge branch '智慧推'
2f444338

by zhengwen.ge
2017-02-23 09:31:58 +0800
Browse Files
update
3ab04faf

by zhengwen.ge
2017-02-23 09:28:35 +0800
Browse Files

22 Feb, 2017

3 commits

update
960c1127

by zhengwen.ge
2017-02-22 21:05:18 +0800
Browse Files
UPDATE
b32142a9

by zhengwen.ge
2017-02-22 21:00:39 +0800
Browse Files
update
e0bc8bcb

by zhengwen.ge
2017-02-22 20:19:13 +0800
Browse Files

21 Feb, 2017

7 commits

返回码200
7acc0171

by zhouxiang
2017-02-21 16:22:52 +0800
Browse Files
给智慧推定制接口返回
bfae6c88

by zhengwen.ge
2017-02-21 15:51:36 +0800
Browse Files
去掉无用代码
f78de500

by zhengwen.ge
2017-02-21 14:31:27 +0800
Browse Files
大数据日志里面增加一个上报类型，方便定位
6c2f83db

by zhengwen.ge
2017-02-21 14:29:42 +0800
Browse Files
智慧推
dfe89de5

by zhengwen.ge
2017-02-21 13:13:35 +0800
Browse Files
Merge branch 'master' into dev-20170216
bbeda715

by zhouxiang
2017-02-21 10:35:11 +0800
Browse Files
no message
7a959797

by zhouxiang
2017-02-21 10:34:54 +0800
Browse Files

20 Feb, 2017

3 commits

update
a8d9aa52

by zhengwen.ge
2017-02-20 17:03:19 +0800
Browse Files
有货
31639696

by zhengwen.ge
2017-02-20 16:54:58 +0800
Browse Files
update
224d97a1

by zhengwen.ge
2017-02-20 16:49:43 +0800
Browse Files

17 Feb, 2017

9 commits

监控上报字段修改
d0df5cb1

by zhengwen.ge
2017-02-17 16:37:21 +0800
Browse Files
增加监控
e0d2fadf

by zhengwen.ge
2017-02-17 15:32:47 +0800
Browse Files
update
9480b2a7

by zhengwen.ge
2017-02-17 13:35:47 +0800
Browse Files
Merge branch 'master' into dev-20170216 ...
bcbdc3df
```
# Conflicts:
#	server/src/main/java/com/yoho/unions/server/service/impl/UnionServiceImpl.java
```
by zhouxiang
2017-02-17 11:36:51 +0800
Browse Files
直接跳转到应用宝
04fafba9

by zhengwen.ge
2017-02-17 11:28:51 +0800
Browse Files
首次激活跳转落地页
a40a76fd

by zhouxiang
2017-02-17 11:22:07 +0800
Browse Files
UPDATE
6f1eeff8

by zhengwen.ge
2017-02-17 10:08:03 +0800
Browse Files
去掉注释
01e950e6

by zhengwen.ge
2017-02-17 09:42:09 +0800
Browse Files
注释掉不必要的代码
392cae6e

by zhengwen.ge
2017-02-17 09:35:22 +0800
Browse Files