YOHOBUY / yohobuy-activity · Commits

03 Mar, 2016

32 commits

自动部署
213cc5fd

by DengXinFei
2016-03-03 21:41:07 +0800
Browse Files
自动部署
d7075bc0

by DengXinFei
2016-03-03 21:33:43 +0800
Browse Files
配置提交
af80836a

by DengXinFei
2016-03-03 21:18:58 +0800
Browse Files
Merge branch 'dev' of git.dev.yoho.cn:yoho30/yohobuy-activity into dev
8291f74f

by DengXinFei
2016-03-03 20:48:38 +0800
Browse Files
zookeeper配置
5864bd9e

by DengXinFei
2016-03-03 20:48:34 +0800
Browse Files
Merge branch 'dev' of http://git.dev.yoho.cn/yoho30/yohobuy-activity into dev ...
525d8f19
```
# Conflicts:
#	dal/src/main/java/com/yoho/queue/dal/IDrawlineLuckyUserDAO.java
```
by chaogeng
2016-03-03 20:43:43 +0800
Browse Files
中奖通知定时任务
160eae1b

by chaogeng
2016-03-03 20:28:25 +0800
Browse Files
aa
f4895997

by hugufei
2016-03-03 18:30:23 +0800
Browse Files
aa
d42f4bcb

by hugufei
2016-03-03 18:29:08 +0800
Browse Files
zz
db5ff753

by hugufei
2016-03-03 18:28:23 +0800
Browse Files
ignore
395c4bb4

by bblu
2016-03-03 18:22:45 +0800
Browse Files
修改
529bad43

by bblu
2016-03-03 18:21:39 +0800
Browse Files
Merge branch 'dev' of http://git.dev.yoho.cn/yoho30/yohobuy-activity into dev
4a1d1830

by hugufei
2016-03-03 18:21:16 +0800
Browse Files
用户活动信息接口-添加活动截止后的中奖提示信息
59bfa90a

by hugufei
2016-03-03 18:17:11 +0800
Browse Files
Merge branch 'dev' of http://git.dev.yoho.cn/yoho30/yohobuy-activity into dev ...
0a62afe0
```
# Conflicts:
#	dal/src/main/java/com/yoho/queue/dal/IDrawlineLuckyUserDAO.java
```
by bblu
2016-03-03 18:04:51 +0800
Browse Files
定时抽奖
0808dfe8

by bblu
2016-03-03 18:03:19 +0800
Browse Files
完善注释
07cdd83c

by hugufei
2016-03-03 17:21:53 +0800
Browse Files
用户活动信息接口提交
e0b45b9b

by hugufei
2016-03-03 16:47:59 +0800
Browse Files
Merge branch 'dev' of http://git.dev.yoho.cn/yoho30/yohobuy-activity into dev
fc129486

by chaogeng
2016-03-03 15:49:14 +0800
Browse Files
修改bug
2be180a2

by chaogeng
2016-03-03 15:49:07 +0800
Browse Files
移除不用的文件
becac36a

by DengXinFei
2016-03-03 15:09:53 +0800
Browse Files
zkAddress只作为客户端
dd95e152

by DengXinFei
2016-03-03 15:05:46 +0800
Browse Files
修改
10497bdd

by bblu
2016-03-03 14:51:26 +0800
Browse Files
Merge branch 'dev' of http://git.dev.yoho.cn/yoho30/yohobuy-activity into dev
93a5d817

by bblu
2016-03-03 14:49:43 +0800
Browse Files
修改查询排队用户接口
44022e34

by bblu
2016-03-03 14:49:28 +0800
Browse Files
maven直接引入parent
0470e4d5

by DengXinFei
2016-03-03 14:44:22 +0800
Browse Files
修改引用BO
1fea1a73

by chaogeng
2016-03-03 14:37:40 +0800
Browse Files
修改响应BO
18baf9b1

by chaogeng
2016-03-03 14:23:12 +0800
Browse Files
Merge branch 'dev' of http://git.dev.yoho.cn/yoho30/yohobuy-activity into dev ...
b0ad73ca
```
# Conflicts:
#	dal/src/main/resources/META-INF/mybatis/DrawlineVirtualUserMapper.xml
```
by chaogeng
2016-03-03 14:18:48 +0800
Browse Files
中奖名单接口
c6b072a7

by chaogeng
2016-03-03 14:14:17 +0800
Browse Files
增加活动抽奖状态表，排队查询，马甲用户查询增加status=1条件
d6ccf5b2

by bblu
2016-03-03 14:09:17 +0800
Browse Files
查询排队信息修改
89725b4d

by bblu
2016-03-03 09:53:28 +0800
Browse Files

02 Mar, 2016

8 commits

自动部署测试
5b2d942d

by DengXinFei
2016-03-02 20:56:13 +0800
Browse Files
测试
6a0ba271

by DengXinFei
2016-03-02 20:29:52 +0800
Browse Files
自动部署
252e63da

by DengXinFei
2016-03-02 20:17:49 +0800
Browse Files
自动部署
4f546f0e

by DengXinFei
2016-03-02 20:14:59 +0800
Browse Files
自动部署
9173f337

by DengXinFei
2016-03-02 19:59:54 +0800
Browse Files
自动部署
c5058e12

by DengXinFei
2016-03-02 19:31:13 +0800
Browse Files
Merge branch 'dev' of http://git.dev.yoho.cn/yoho30/yohobuy-activity into dev ...
395e523e
```
# Conflicts:
#	dal/src/main/java/com/yoho/queue/dal/IDrawlineLuckyUserDAO.java
```
by chaogeng
2016-03-02 18:27:29 +0800
Browse Files
用户中奖DAO
00357ec8

by chaogeng
2016-03-02 18:16:55 +0800
Browse Files