Commit Graph

169 Commits (89edac1feeb1d177587818b871c7c8da8fe817ce)

Author SHA1 Message Date
ELF 3f42d2967c 修改
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
ELF 990a2bd206 解决冲突
ELF 8224cfb362 修改
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 a8f4f16349 Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/view.html
#	Data/update.sql
ELF f0a8b6bc3b 修改
ELF 76fcfec7c2 修改
ELF 5f5a6ee1af 修改
廖金灵 a808b86865 Merge branch 'feature/paytime_summary' of wmtx/platform into release
汇付宝
chenzhi 511f53e83c 优化权限
chenzhi 0ba02069a0 优化补点计算方式
zhengyongxing 9aed64f46d 推广员充值汇总优化,补单功能添加
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络
chenzhi e1d624fe8b 优化导出并聚合数据
chenzhi c5e3d78835 新增导出
chenzhi e80d4eb539 新增确认
chenzhi 93a8bb70e1 新增编辑
tping 9fd06c27d3 Merge branch 'hotfix/alipaytoalipay' into feature/platfrom_aggregate_finance
# Conflicts:
#	Data/update.sql
chenzhi 6162f9f8a1 生成上下游结算单
zhengyongxing 5f0b7a6de0 充值方式文字修正,金猪改成苹果
sunke d7e61edaa1 汇付宝
chenzhi afee89ec03 优化模板无聚合
chenzhi 6a3b9b6da3 新增游戏分成比例
chenzhi fd4e0baffd 新增游戏比例模板
sunke a4377c017e 支付设置
chenzhi 450ef803d6 合并
chenzhi 3e7778df35 优化零元问题
zhengyongxing 4d938b85f4 导出账号权限修改配置
zhengyongxing 0482836a8e 导出账号权限添加
廖金灵 bab7fec46d Merge branch 'fix/fiancecount_gamename_change' of wmtx/platform into release
游戏名称不含设备类型优化
chenzhi c45ca2942d 优化设备名称函数
chenzhi 6f7e0de83d 优化平台币设备,名称
chenzhi f0a19cfc99 优化设备名称为字典
chenzhi 9064fc7c58 游戏统计 游戏名称不含设备类型优化
chenzhi 55d49e8b4b 优化推广公会列表导出
chenzhi 1761d37b5c 推广公会列表 适配新内外团规则
chenzhi ccda6e0b39 开启操作日志
ELF 9e82faf6f3 关闭后台操作日志
chenzhi 0344471659 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi cfbbf8e76b 优化默认公司名称为海南万盟天下科技
zhengyongxing c6eef5124d 测试资源修改
zhengyongxing 800680c6c0 测试资源申请审核验证增加区服
zhengyongxing d6db0d3789 测试资源根据可用余额进行验证
zhengyongxing f840a59ce2 日志操作bug修复
chenzhi 0b8cf1d3ee Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi 44f44d0c4a 操作日志函数修改
zhengyongxing 3b73c1d340 操作日志bug修正
liuweiwen 010080e32b Merge branch 'feature/yibao_company' into release
liuweiwen f35c7bdc77 实时充值查询增加易宝支付