96 Commits (624a2b7cde145ab9962726f3a616802994785929)

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