Commit Graph

82 Commits (34e25f293a18507f1c4a53cac01de1e1253a3451)

Author SHA1 Message Date
廖金灵 54266852cc Merge pull request 'feature/more_finance_20201211' () from feature/more_finance_20201211 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/67
chenzhi 813aebfd64 优化统计
zhengyongxing 9c0006ef45 12.28功能提交
zhengyongxing f855835501 12.28功能提交
chenzhi 7ccf5e5857 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211
zhengyongxing d1b0ec55a8 12.28功能提交
chenzhi f0829e84cc 优化统计
zhengyongxing c716535975 12.28功能提交
zhengyongxing 8430fa1813 12.18功能提交
zhengyongxing c30e396b2c 未结算数据的补充
chenzhi bea27fd5de 优化游戏汇总
chenzhi 7f9bb248dd 优化推广员统计
chenzhi 1f694ef47b 优化推广员充值
chenzhi a6f9d82245 优化推广员累计注册
chenzhi 7a876e01ab 优化新增推广员汇总
ELF 55466e44ee 修改
yulingwei 8d36e35271 upt
yulingwei 9cdab21db9 repair search
yulingwei 08400bd67a upt
yulingwei 9a380d7756 upt
yulingwei 7b9bb91e16 upt
yulingwei 64bb801be2 1
yulingwei 6390d680ec upt
yulingwei 96327507f4 upt
yulingwei 52b478f570 upt
yulingwei 7fc6609d78 upt
yulingwei aa77fb7821 upt
yulingwei b9dfe08177 upt
yulingwei 1119e8faf9 upt
yulingwei 80597c4894 upt
yulingwei 0b54c71cb0 upt
zhengyongxing dbad9a08db Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_statistics
 Conflicts:
	Application/Admin/Common/function.php
	Application/Admin/Controller/TimingController.class.php
zhengyongxing f63b115641 Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/add.html
#	Application/Admin/View/PromoteCompany/edit.html
zhengyongxing 9aed64f46d 推广员充值汇总优化,补单功能添加
廖金灵 a4d86b4fdd Merge branch 'feature/promote_statistics' of wmtx/platform into master
推广员充值统计添加默认时间
zhengyongxing 711f98ef86 推广员充值统计添加默认时间
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络
chenzhi c93a8577c4 合并
zhengyongxing 001e9e70f8 管理后台导出权限添加
chenzhi 52c78bb835 优化统计-统计-推广员统计
zhengyongxing a6a29bf63a 统计日志添加
chenzhi cc653c2d2d 优化tp1.id错误
chenzhi ff67974413 修复获取推广员统计bug
chenzhi a37d0d6ec4 优化推广员充值统计排序问题
chenzhi 43774e9099 推广员充值统计新增官方渠道统计
chenzhi 14fa967f00 优化推广员统计数据
chenzhi 715a1a8a2c 优化推广统计区服问题
chenzhi f580b44289 优化推广员统计区服选择
zhengyongxing ea80b8fd44 游戏充值统计检索条件修正
zhengyongxing 2f25386518 游戏充值统计检索条件修正