112 Commits (986065ab4b20d58f689a6de340b850ced7f3ddd5)

Author SHA1 Message Date
zhengyongxing c749df4936 11月功能提交 4 years ago
zhengyongxing 5add29fa6b 11月功能提交 4 years ago
zhengyongxing 2040991894 11月功能提交 4 years ago
zhengyongxing 4526b5b741 11月功能提交 4 years ago
chenzhi 10d13472ec 紧急修复外团选择游戏 4 years ago
ELF 19c782b053 解决冲突 4 years ago
zhengyongxing 15ad0a902b Merge branches 'feature/add_item' and 'release' of 47.111.118.107:wmtx/platform into feature/add_item
 Conflicts:
	Data/update.sql
4 years ago
chenzhi c40e366a03 优化删除游戏报错bug 4 years ago
zhengyongxing 2cdc4e815b 下游公司cp比例修改 4 years ago
zhengyongxing 28f73f3140 公司比例格式修改 4 years ago
chenzhi 3ef485516f 优化工会游戏修改 4 years ago
ELF 6fcaa1362c 重置权限缓存 4 years ago
zhengyongxing ceef36a7d1 内部公司功能完善 4 years ago
chenzhi f169d65c1c 优化推广公司添加排序 4 years ago
廖金灵 548c76bd99 Merge branch 'feature/promote_company_merge' of wmtx/platform into master
优化
4 years ago
ELF 1b949af7f5 优化 4 years ago
chenzhi 9c11344906 优化下游推广公司导出 4 years ago
郑永星 3310553654 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
比例格式修正
4 years ago
zhengyongxing 1c08d1a221 比例格式修正 4 years ago
ELF bdc23b7d90 修改 4 years ago
ELF 1fb2fa7e81 解决冲突 4 years ago
ELF 8d98bd5a36 优化 4 years ago
廖金灵 c9b1326c42 Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
4 years ago
ELF 6596e01a29 修改 4 years ago
zhengyongxing 65532fc0ab Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/company_export_change_other
 Conflicts:
	Application/Admin/Controller/PromoteCompanyController.class.php
	Application/Base/Tool/AggregateClient.class.php
4 years ago
ELF 32bc839dcd 合并 4 years ago
ELF e0bbec0978 修改 4 years ago
ELF ad2037408d 优化 4 years ago
ELF e441f030c0 优化 4 years ago
ELF e9038d7471 ss 4 years ago
ELF e4854aca3a 修改 4 years ago
ELF 1a14ed8dc7 修改 4 years ago
elf@home 50755b89c5 修改 4 years ago
ELF cc6c5d4e74 修改 4 years ago
ELF 0923006a20 修改 4 years ago
chenzhi 04ac1da1d7 优化公司控制会长游戏规则 4 years ago
chenzhi e8eb963fc1 修正公司取消游戏推广员无效 4 years ago
elf@home f8f9046a87 提交 4 years ago
chenzhi 2b2acf833c 优化重复添加 4 years ago
ELF fa9d330603 修改 4 years ago
zhengyongxing 62f4ce3362 上下游聚合打款信息修改 4 years ago
chenzhi 47e57f48e6 优化审批文字错误 4 years ago
chenzhi 3318298d2e 优化上下游导出时间 4 years ago
chenzhi b0034d5f19 优化推广公司游戏申请不审核 4 years ago
chenzhi ac65098827 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement723 4 years ago
chenzhi 0430293bb7 优化电话不限制 4 years ago
chenzhi 6024ae342c 优化顺序及导出 4 years ago
chenzhi 4dd8526e2b 优化日志 4 years ago
chenzhi 3ad0d447d4 优化显示 4 years ago
chenzhi 6181059faf 优化搜索 4 years ago