微信公众帐号红包活动
生成JA
Commit
抢红包业务逻辑
修改红包创建

Conflicts:
	src/main/java/com/ruyicai/weixin/controller/PacketActivityController.java
	src/main/java/com/ruyicai/weixin/service/PacketActivityService.java
查询送出红包列表
双色球算法
抢红包
抢红包修改
修改 查询用户送出红包列表
查红包详情
答谢TA
抢红包修改
抢红包修改
查询用户抢到红包列表
modify
Merge branch 'develop' of https://github.com/momoplan/weixin into
develop

Conflicts:
	src/main/java/com/ruyicai/weixin/controller/PacketActivityController.java
	src/main/java/com/ruyicai/weixin/dao/PuntPacketDao.java
	src/main/java/com/ruyicai/weixin/exception/ErrorCode.java
	src/main/java/com/ruyicai/weixin/service/PacketActivityService.java
Merge branch 'develop' of https://github.com/momoplan/weixin into develop
修改
查询我的活动