435 Commits (4cfa9c387f07cc4b24868559d872d3006448b0c7)

Author SHA1 Message Date
chenzhi b93b2c59ce Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi c76e0620b7 [优化 ]新增历史累计充值记录 5 years ago
ELF 2f885bcf3e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 200d9e8667 修改bug 5 years ago
zhengyongxing abdf68a91c 收回绑币玩家账号select框改为input框 5 years ago
yulingwei 485e3930f9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei 12362190e6 upt 5 years ago
chenzhi 86b53d375c [新增]玩家列表汇总统计 5 years ago
chenzhi 0ca7d2f5d2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi ea580a52fe 隐藏推广员统计的二级页 5 years ago
zhengyongxing 12a729444a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhengyongxing ae18f1fb24 推广员统计修改 5 years ago
chenzhi 0b0984d266 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi b7dd9edaa9 [优化]玩家列表累记充值统计 5 years ago
zhengyongxing 8e18e8faac 推广员统计官方渠道添加 5 years ago
chenxiaojun 5fcad13fce 根据时间统计玩家充值 5 years ago
chenxiaojun 2123b29479 根据时间统计玩家充值 5 years ago
chenzhi df9d1415df [修复]推广员充值统计无promote_id问题 5 years ago
yulingwei 8fee02fc4c 修改时间 5 years ago
chenzhi 8007d9954f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi 849fd77ac6 优化推广员统计的方法 5 years ago
chenxiaojun 0571347aeb Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	Application/Home/Controller/QueryController.class.php
5 years ago
chenxiaojun d9659ea975 推广平台->数据汇总->充值玩家--更新 5 years ago
chenxiaojun a53970efcf 推广平台->数据汇总->充值玩家--更新 5 years ago
yulingwei 0e1abdfa94 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei feecf9199d 电子邮箱改为选填 5 years ago
ELF 809191e0f2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF e2a2a07f03 修改bug 5 years ago
chenzhi 8af46f08c2 优化推广员统计1 5 years ago
zhengchanglong 387be649de Merge branch 'dev-cz' into dev 5 years ago
chenzhi 256545a59a 123 5 years ago
zhengyongxing 5c97bb7610 数据分析bug修正 5 years ago
zhengyongxing db40381bb1 定时器接口时间区间修正 5 years ago
zhengyongxing 4f27c2fb29 统计bug修正 5 years ago
zhengchanglong b7fdcf38f6 Merge branch 'dev_zcl' into dev 5 years ago
zhengchanglong d230f0e047 Merge branch 'dev_zyx' into dev_zcl 5 years ago
zhengyongxing 08b2ba432a 统计数据修正 5 years ago
ELF 51d1d730e1 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF c0f19228d2 修改bug 5 years ago
chenxiaojun 925d80ac66 管理后台->用户->玩家组->角色查询--更新 5 years ago
yulingwei 26d0d0d6cb merge 5 years ago
chenxiaojun 0875ed5a9a 管理后台->用户->玩家组->角色查询--更新 5 years ago
yulingwei a9f06b1d57 修改批量锁定问题 5 years ago
zhengchanglong 36c4e476ea Merge branch 'dev_zcl' into dev
# Conflicts:
#	Data/update.sql
5 years ago
chenzhi df03c05651 修正统计bug 5 years ago
zhengyongxing 118f706440 脚本去除部分输出 5 years ago
zhengchanglong 15695d5b5d Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
#	Application/Mobile/Controller/SsgController.class.php
5 years ago
zhengyongxing 0edc4452e3 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
 Conflicts:
	Application/Mobile/Controller/SsgController.class.php
5 years ago
chenzhi 2a417c2746 123 5 years ago
ELF 2254610041 修改bug 5 years ago