Commit Graph

1211 Commits (711f98ef865a7338e1c3cdd0b5bb5aaa4b2eb676)

Author SHA1 Message Date
chenzhi 450ef803d6 合并
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 0ca2f2a064 游戏统计导出修改
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 613d60e4a7 数据权限配置修改
廖金灵 ff5b2e3483 Merge branch 'feature/aggregate_finance' of wmtx/platform into release
聚合财务结算单
chenzhi 21a985ae82 聚合财务结算单ok
chenzhi 8137778ec1 新增聚合操作日志
zhengyongxing 727b335b45 测试资源修改
chenzhi 63f5354dc3 优化重算
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 聚合财务重算
zhengyongxing b698495dbb 游戏统计添加元素修正
chenzhi 253b47b2a9 聚合财务子操作
chenzhi 990c62b06a 批注增删改查
chenzhi 6b5f60f8e6 新增凭证增删改查
chenzhi ce4c938080 优化聚合结算导出
chenzhi cf9480eb89 聚合财务导出
chenzhi 422728ed11 聚合财务编辑
zhengyongxing 0ebde4cb17 导出权限修正
chenzhi bf7c7ed14f 审核
zhengyongxing e60b9b2edf 测试资源批量封号
chenzhi 114cf4a503 聚合对账新增对账金额统计
chenzhi 51322e3317 聚合财务2
chenzhi 6d0e7c3a00 聚合对账1
zhengyongxing 63e4789069 游戏编辑支付宝 汇付宝添加
zhengyongxing a5554f7fa3 推广员业务配置功能添加
zhengyongxing 295ca2d803 推广员业务配置功能添加
zhengyongxing 1a0b2dbaba 推广员游戏列表查看全选问题
zhengyongxing fcc7bf2aaa 管理后台-财务管理-游戏统计-添加元素
zhengyongxing 322b4b6cee 管理后台导出权限添加
zhengyongxing 001e9e70f8 管理后台导出权限添加
廖金灵 7ab6c8ad68 Merge branch 'feature/fix_work_order' of wmtx/platform into release
修复问题
yulingwei 2ac6f7ebee upt
廖金灵 820885f3dd Merge branch 'feature/platform_rule' of wmtx/platform into release
推广规则
sunke bde08adcc2 平台币
廖金灵 8b2ae9d6da Merge branch 'feature/fix_work_order' of wmtx/platform into release
工单统计及iOS下载数优化