YOHOBUY / yohobuy-union · Commits

28 Apr, 2017

16 commits

添加白名单
54038473

by zhengwen.ge
2017-04-28 14:47:44 +0800
Browse Files
日志优化
3b8dad8a

by zhengwen.ge
2017-04-28 14:05:36 +0800
Browse Files
Merge branch 'master' into dev_0427_channelRepormGDT ...
de7b9fb2
```
# Conflicts:
#	web/src/main/resources/databases.yml
#	web/src/main/webapp/META-INF/autoconf/databases.yml
```
by zhengwen.ge
2017-04-28 14:02:06 +0800
Browse Files
代码优化
6e1bb7b4

by zhengwen.ge
2017-04-28 13:59:22 +0800
Browse Files
7天数据
5116bac6

by zhengwen.ge
2017-04-28 13:53:29 +0800
Browse Files
<SRS> return empty BO
b0f00d31

by Zhang
2017-04-28 13:48:40 +0800
Browse Files
Merge branch 'master' into dev_0428_总成本报表需求二期
e6998b76

by zhengwen.ge
2017-04-28 13:15:32 +0800
Browse Files
<SRS> set beginTime and endTime.
25b9e7e4

by Zhang
2017-04-28 12:22:56 +0800
Browse Files
日志优化
43810ea5

by zhengwen.ge
2017-04-28 12:20:10 +0800
Browse Files
<SRS> tmp commit
fa478490

by Zhang
2017-04-28 11:38:13 +0800
Browse Files
<SRS> remove junk
1f08ad4c

by Zhang
2017-04-28 11:31:34 +0800
Browse Files
不设最大值
547925c5

by zhengwen.ge
2017-04-28 10:57:35 +0800
Browse Files
<SRS> no message.
65f5f403

by Zhang
2017-04-28 10:28:24 +0800
Browse Files
<SRS> Add database.yml DAO
b7ab99fe

by Zhang
2017-04-28 10:14:29 +0800
Browse Files
update
8a29ed8b

by zhengwen.ge
2017-04-28 09:51:41 +0800
Browse Files
<SRS> fix error
5fc2a46f

by Zhang
2017-04-28 09:41:06 +0800
Browse Files

27 Apr, 2017

16 commits

<SRS> delete wrong file.
1a383bf3

by Zhang
2017-04-27 21:09:21 +0800
Browse Files
<SRS> first complete.
9a9b0a6b

by Zhang
2017-04-27 21:07:23 +0800
Browse Files
<SRS> tmp commit.
a27c1467

by Zhang
2017-04-27 20:29:18 +0800
Browse Files
<SRS> temp commit.
c99986f4

by Zhang
2017-04-27 20:04:59 +0800
Browse Files
Merge branch 'dev_0426_总成本报表需求'
395fbffc

by zhengwen.ge
2017-04-27 20:00:06 +0800
Browse Files
<SRS> temp commit.
a6a326d6

by Zhang
2017-04-27 19:39:25 +0800
Browse Files
<SRS> add api.
1a66a1c7

by Zhang
2017-04-27 18:50:04 +0800
Browse Files
<SRS> no message.
adcebfd6

by Zhang
2017-04-27 16:40:35 +0800
Browse Files
修改maven包依赖
9c22b376

by DengXinFei
2017-04-27 15:55:42 +0800
Browse Files
<SRS> delete test data.
caca961f

by Zhang
2017-04-27 14:38:03 +0800
Browse Files
<SRS> Add log.
5b9f1a70

by Zhang
2017-04-27 14:27:27 +0800
Browse Files
<SRS> composing data.
e877b05f

by Zhang
2017-04-27 14:22:51 +0800
Browse Files
Merge branch 'dev_0426_总成本报表需求' of http://git.yoho.cn/yoho30/yohobuy-union into dev_0426_总成本报表需求
e982d4c3

by tanling
2017-04-27 13:57:03 +0800
Browse Files
<SRS> fix DAO bugs.
5cc52080

by Zhang
2017-04-27 13:23:21 +0800
Browse Files
修改有效期为7天
e4a0a2bb

by DengXinFei
2017-04-27 11:25:30 +0800
Browse Files
<SRS> back end code completed.
9e650685

by Zhang
2017-04-27 08:41:33 +0800
Browse Files

26 Apr, 2017

8 commits

修改日志可能的异常
9ad53adf

by DengXinFei
2017-04-27 01:55:04 +0800
Browse Files
去除校验
c0b3a450

by DengXinFei
2017-04-27 00:49:37 +0800
Browse Files
no message
06380415

by tanling
2017-04-26 18:12:16 +0800
Browse Files
Merge branch 'dev_0426_总成本报表需求' of http://git.yoho.cn/yoho30/yohobuy-union into dev_0426_总成本报表需求 ...
9b72a5ba
```
# Conflicts:
#	channel/src/main/java/com/yoho/unions/channel/restapi/MktCostReportFormController.java
```
by Zhang
2017-04-26 18:05:50 +0800
Browse Files
<SRS> add param.
b4f904ab

by Zhang
2017-04-26 18:04:35 +0800
Browse Files
页面调试
15912e13

by tanling
2017-04-26 17:44:44 +0800
Browse Files
no message
a0724654

by tanling
2017-04-26 17:33:10 +0800
Browse Files
no message
932c4f42

by tanling
2017-04-26 17:26:29 +0800
Browse Files