Commit Graph

155 Commits (1bea859fd49f25989fd1b9c909b9ea5001b0ce74)

Author SHA1 Message Date
ELF 0803b686c3 解决冲突
ELF 0206a422f9 解决冲突
ELF 557f0203ac 解决冲突
ELF 62d7f15fdc Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_landing_assign
zhengyongxing 1fff2e6c09 财务代码搬到新的分支上
chenzhi 2619e598e8 合并marster
yulingwei 2fbea72d26 up
chenzhi afac0376be 新增下游审批
chenzhi cafdc39f2a 优化添加
chenzhi d662c89b7e zancun
ELF e8a925b64c 游戏统计添加聚合充值数据
chenzhi 5aa7427504 新增公司信息编辑
chenzhi 33cf2cf8a6 新增审核列表
chenzhi f66ec6d1ff 优化函数
chenzhi 296b5a0d8f 优化关系函数
ELF 15d0b454a4 修改
chenzhi d6ec8e0248 新增导出
ELF f167d63c4a 修改
zhengyongxing 15b9efcd7e 江息网络漏掉的修改
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
廖金灵 c4ec5753f0 Merge branch 'feature/loginInfo' of wmtx/platform into release
手机验证码登录推广后台
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络
chenzhi 6a3b9b6da3 新增游戏分成比例
sunke 2a017bfb45 loginmodel
zhengyongxing 132b601f74 测试资源搜索功能添加
zhengyongxing 6081e088db 游戏统计bug修改
zhengyongxing 057a51dbeb 游戏统计bug修正
zhengyongxing 81bd79ecf8 游戏统计bug修正
zhengyongxing 4b63c7b786 游戏统计bug修正
zhengyongxing b768d41935 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
 Conflicts:
	Application/Home/Controller/PackageController.class.php
zhengyongxing b6b97c130d 测试资源代码修正
zhengyongxing b698495dbb 游戏统计添加元素修正
ELF d9cc82f73a 修改网站注册
ELF 908722c5be 修改
zhengyongxing fcc7bf2aaa 管理后台-财务管理-游戏统计-添加元素
zhengyongxing 001e9e70f8 管理后台导出权限添加
ELF 41e1801550 修改手机登录bug
廖金灵 bab7fec46d Merge branch 'fix/fiancecount_gamename_change' of wmtx/platform into release
游戏名称不含设备类型优化
廖金灵 9222d99127 Merge branch 'feature/change_company_belong' of wmtx/platform into release
推广员内外团归属优化
chenzhi 2401acb9a0 优化公会统计bug
chenzhi 2b7f434955 财务管理-游戏管理 游戏名称列表和导出优化
chenzhi 55d49e8b4b 优化推广公会列表导出
ELF 4a1ffd2955 解决冲突
chenzhi 1761d37b5c 推广公会列表 适配新内外团规则
chenzhi d7662eb305 推广员现在归属于公司团体
zhengyongxing 6f749fb99d Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_opertion_log
 Conflicts:
	Application/Admin/Controller/FinancePromoteController.class.php
	Application/Common/Common/extend.php
廖金灵 a1f3c6e205 Merge branch 'feature/download_type_list' of wmtx/platform into release
iOS下载统计
yulingwei ead4a8598e upt
zhengyongxing a086b38d3e 管理后台日志唯一键值bug修改