Commit Graph

427 Commits (77574b4d3757c177a7d5d2cd88ad29663c28010f)

Author SHA1 Message Date
chenzhi 0ca7d2f5d2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi ea580a52fe 隐藏推广员统计的二级页
zhengyongxing 12a729444a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing ae18f1fb24 推广员统计修改
chenzhi 0b0984d266 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi b7dd9edaa9 [优化]玩家列表累记充值统计
zhengyongxing 8e18e8faac 推广员统计官方渠道添加
chenxiaojun 5fcad13fce 根据时间统计玩家充值
chenxiaojun 2123b29479 根据时间统计玩家充值
chenzhi df9d1415df [修复]推广员充值统计无promote_id问题
yulingwei 8fee02fc4c 修改时间
chenzhi 8007d9954f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 849fd77ac6 优化推广员统计的方法
chenxiaojun 0571347aeb Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	Application/Home/Controller/QueryController.class.php
chenxiaojun d9659ea975 推广平台->数据汇总->充值玩家--更新
chenxiaojun a53970efcf 推广平台->数据汇总->充值玩家--更新
yulingwei 0e1abdfa94 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei feecf9199d 电子邮箱改为选填
ELF 809191e0f2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF e2a2a07f03 修改bug
chenzhi 8af46f08c2 优化推广员统计1
zhengchanglong 387be649de Merge branch 'dev-cz' into dev
chenzhi 256545a59a 123
zhengyongxing 5c97bb7610 数据分析bug修正
zhengyongxing db40381bb1 定时器接口时间区间修正
zhengyongxing 4f27c2fb29 统计bug修正
zhengchanglong b7fdcf38f6 Merge branch 'dev_zcl' into dev
zhengchanglong d230f0e047 Merge branch 'dev_zyx' into dev_zcl
zhengyongxing 08b2ba432a 统计数据修正
ELF 51d1d730e1 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF c0f19228d2 修改bug
chenxiaojun 925d80ac66 管理后台->用户->玩家组->角色查询--更新
yulingwei 26d0d0d6cb merge
chenxiaojun 0875ed5a9a 管理后台->用户->玩家组->角色查询--更新
yulingwei a9f06b1d57 修改批量锁定问题
zhengchanglong 36c4e476ea Merge branch 'dev_zcl' into dev
# Conflicts:
#	Data/update.sql
chenzhi df03c05651 修正统计bug
zhengyongxing 118f706440 脚本去除部分输出
zhengchanglong 15695d5b5d Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
#	Application/Mobile/Controller/SsgController.class.php
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
chenzhi 2a417c2746 123
ELF 2254610041 修改bug
zhanglingsheng fb85d32c87 合并分支
yulingwei 38680ddb05 更新
zhengyongxing 1626123074 数据统计7日平均时长修正
zhengchanglong f8008a4b5e Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
#	Data/update.sql
zhengyongxing 64c059cccc Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
 Conflicts:
	Data/update.sql
yulingwei 24d3e6ab07 修改bug
yulingwei 046beee6be 修改bug
zhengchanglong a4dc55f4e3 Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
#	Data/update.sql