fix: 退定无效果 && update: 酒水 #14

Merged

QBbing merged 5 commits from :master into master

2019-05-16 15:04:18 +00:00

Author	SHA1	Message	Date
linger	ce5904d826	Merge remote-tracking branch 'QBbing/master'	2019-05-16 22:44:22 +08:00
linger	1c9e1bd004	fix: 退定无效果	2019-05-16 22:44:05 +08:00
linger	0cc94cdb0c	更新酒水页	2019-05-16 22:43:42 +08:00
linger	5eb6c7f1e8	初始化酒水页面	2019-05-16 22:20:38 +08:00
linger	4a36735845	更新配置文件	2019-05-16 22:20:26 +08:00