Commit Graph

89 Commits (729136a95cfddaedee9008663e761e95db56edcd)

Author SHA1 Message Date
zhengyongxing 2220a6cfec 财务支付时间修改,增加手机登录验证,及开发推广员列表名称
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
廖金灵 a808b86865 Merge branch 'feature/paytime_summary' of wmtx/platform into release
汇付宝
yulingwei 0472fe9cbc upt
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络
sunke a4377c017e 支付设置
zhengyongxing 0ebde4cb17 导出权限修正
zhengyongxing 0482836a8e 导出账号权限添加
zhengyongxing fcc7bf2aaa 管理后台-财务管理-游戏统计-添加元素
zhengyongxing 001e9e70f8 管理后台导出权限添加
sunke 163388e75c 平台币
sunke 07c385e561 平台
sunke b6649a7b9d 平台币
sunke 253c956794 平台币
sunke 2adcb68c06 平台币新增需求
廖金灵 bab7fec46d Merge branch 'fix/fiancecount_gamename_change' of wmtx/platform into release
游戏名称不含设备类型优化
chenzhi ce1d15c602 优化游戏订单导出
chenzhi f0a19cfc99 优化设备名称为字典
chenzhi 9064fc7c58 游戏统计 游戏名称不含设备类型优化
廖金灵 09b04c502e Merge branch 'fix/member_user_info' of wmtx/platform into release
优化游戏统计弹框时间错误问题
chenzhi 82aa4f762b 优化游戏统计弹框时间错误问题
sunke 0ffa97a1dd 修复
sunke 797102a556 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/PlatFormCoinData
sunke 5b74e65585 统计
zhengyongxing 6249b6cf81 Merge branches 'feature/fee_form' and 'release' of 47.111.118.107:wmtx/platform into feature/fee_form
 Conflicts:
	Application/Admin/Controller/FinanceController.class.php
zhengyongxing 87b1b04040 充值财务管理金额保留小数点
sunke 7194cd49ae 平台币
sunke 35f5cc03bb value_detail
sunke e94c64a881 平台币统计
chenzhi 381327ae21 优化游戏统计
liuweiwen 2ed47500f0 Merge branch 'hotfix/recharge_statistics' into feature/admin_optimize
liuweiwen b94bf93823 0点游戏统计
liuweiwen b5a2ddba3c 游戏订单查看,查询时0点属于当天
jbRotk 65461ff200 c
zhengyongxing b96e65b8fe 游戏充值统计检索条件修正
zhengyongxing b0899f3fc9 支付渠道统计bug修正,官网与推广后台充值计入平台币
liuweiwen d31c2f28f3 游戏统计
zhengyongxing 17821039ab Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengyongxing bd39f880fe 平台统计修正
liuweiwen adaa402a14 Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 1291009a02 游戏统计搜索时间范围
zhengyongxing 80ebdc7f80 支付渠道统计添加权限
liuweiwen aaabd0a07f 游戏统计搜索时间范围
liuweiwen 7b87c7718d 游戏统计搜索时间范围
zhengyongxing 10aa8cf81c 月结统计导出添加
zhengyongxing 5daf1eb565 支付渠道查询修改
liuweiwen 4ed57dcda1 增加注释
liuweiwen af541bface 平台统计列表
liuweiwen cdbf059ee4 平台币直充明细列表,搜索,导出
内充支出明细列表,搜索,导出
liuweiwen 53a235379a 游戏订单查看-导出excell