Commit Graph

2425 Commits (7e0fe5d97551488a9a4e940d4c1bdcd2e66d3a3b)

Author SHA1 Message Date
张谷诚 bb833deb98 Merge branch 'hotfix/test_resource_search' of wmtx/platform into master
测试资源搜索功能添加
chenzhi ae4c58b6fd 修改推广员流水可选填
zhengyongxing 132b601f74 测试资源搜索功能添加
zhengyongxing 878414aeb2 测试资源搜索修正
张谷诚 c5f9a25a9e Merge branch 'feature/export_authority' of wmtx/platform into release
导出bug修改
zyx ee9f53ce0b 导出权限bug修改
zhengyongxing 301a5a7f5a 导出bug修改
zhengyongxing 5e71728097 导出bug修改
chenzhi 450ef803d6 合并
chenzhi 3e7778df35 优化零元问题
chenzhi 861fd07965 优化检索
chenzhi 834dbe0867 优化导出支付信息不记录
廖金灵 52b483356d Merge branch 'feature/export_authority' of wmtx/platform into release
游戏统计bug修改
zhengyongxing 6081e088db 游戏统计bug修改
chenzhi 0dab114f1e 优化操作提醒
廖金灵 44a49a1b2e Merge branch 'feature/export_authority' of wmtx/platform into release
游戏统计导出修改
廖金灵 3e43b8cb7c Merge branch 'hotfix/company_bank' of wmtx/platform into release
优化银行信息不记录
chenzhi 14efc9650f 优化银行信息不记录
zhengyongxing 1659c55ef2 用户行为日志修改
zhengyongxing 0ca2f2a064 游戏统计导出修改
chenzhi 2ad89c2fb6 优化导出时间
chenzhi 5a9fc76374 申请编辑信息遮罩不关闭
zhengyongxing 4d43e877a1 Merge branches 'feature/export_authority' and 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
 Conflicts:
	Data/update.sql
zhengyongxing acaebe0217 Merge branches 'feature/export_authority' and 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
 Conflicts:
	Data/update.sql
zhengyongxing 60c0c8ee39 Merge branches 'feature/promote_data_config' and 'release' of 47.111.118.107:wmtx/platform into feature/promote_data_config
 Conflicts:
	Data/update.sql
chenzhi 22dc7a62ce 优化游戏统计导出游戏类型不识别
chenzhi 496d6a27bb 优化推广员选择后驻留问题
chenzhi 7fa6baf860 玩家登陆显示优化
zhengyongxing c58cdd31af 用户行为日志导出修正
zhengyongxing 613d60e4a7 数据权限配置修改
zhengyongxing 057a51dbeb 游戏统计bug修正
廖金灵 e88867abe5 Merge branch 'feature/aggregate_finance' of wmtx/platform into release
新增权限不验证
zhengyongxing 81bd79ecf8 游戏统计bug修正
chenzhi 973f7ca394 现在权限不验证
廖金灵 ff5b2e3483 Merge branch 'feature/aggregate_finance' of wmtx/platform into release
聚合财务结算单
zhengyongxing 4b63c7b786 游戏统计bug修正
chenzhi 21a985ae82 聚合财务结算单ok
zhengyongxing 4f88cd025e 绑币导出修正
chenzhi 8137778ec1 新增聚合操作日志
zhengyongxing 38f478d63d 数据调整修改
zhengyongxing 8d7dbe5469 测试资源修改
zhengyongxing 727b335b45 测试资源修改
chenzhi 63f5354dc3 优化重算
zhengyongxing 5dbd0eb8fa 业绩配置修改
zhengyongxing a9ce0585cc 测试资源配置
chenzhi 2a28cf9008 聚合财务优化权限
zhengyongxing b768d41935 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
 Conflicts:
	Application/Home/Controller/PackageController.class.php
chenzhi fe662ce160 审核子操作ok
zhengyongxing b6b97c130d 测试资源代码修正
chenzhi 16d9813e18 聚合财务重算