70 Commits (3e27f09e7d0825d0782ed59f1293161bd0d8dabe)

Author SHA1 Message Date
tping 0d52dc7d61 1126 4 years ago
tping c75d73c9f7 1126 4 years ago
zhengyongxing 0631c22c93 上游导出修正 4 years ago
廖金灵 548c76bd99 Merge branch 'feature/promote_company_merge' of wmtx/platform into master
优化
4 years ago
ELF 1b949af7f5 优化 4 years ago
陈志 0c696fd8a5 Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
4 years ago
郑永星 ff1117c0b7 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
小bug修改
4 years ago
zhengyongxing 5acd5197ae 小bug修改 4 years ago
ELF bdc23b7d90 修改 4 years ago
ELF 1fb2fa7e81 解决冲突 4 years ago
ELF 8d98bd5a36 优化 4 years ago
zhengyongxing 3c6418425a 上游导出修正 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 1fbb9f097e ss 4 years ago
ELF 53f2649d9a ss 4 years ago
ELF 32bc839dcd 合并 4 years ago
ELF 9b88e97672 修改 4 years ago
elf@home 50755b89c5 修改 4 years ago
ELF cc6c5d4e74 修改 4 years ago
chenzhi 03341a7d9f 优化游戏资质展示 4 years ago
zhengyongxing 62f4ce3362 上下游聚合打款信息修改 4 years ago
chenzhi aabc0703df 优化结算时间选择 4 years ago
chenzhi a948986b41 优化上游导出 4 years ago
chenzhi 6181059faf 优化搜索 4 years ago
chenzhi 10e56211ce 优化导出提示 4 years ago
chenzhi 1ec951d344 优化空值显示 4 years ago
chenzhi 5aa7427504 新增公司信息编辑 5 years ago
chenzhi c708fb6d11 优化CP搜索 5 years ago
chenzhi 35f2fe3f05 优化公司显示 5 years ago
chenzhi f7d90780aa 新增CP公司审核 5 years ago
chenzhi 33cf2cf8a6 新增审核列表 5 years ago
chenzhi 0c2e2db65d 新增税费费率 5 years ago
chenzhi 58c8508ce4 新增cp导出 5 years ago
chenzhi d6ec8e0248 新增导出 5 years ago
chenzhi 2a4541569d 优化列表显示 5 years ago
chenzhi 04e13844c3 zancun 5 years ago
chenzhi c9d6b9859d 合并热更 5 years ago
chenzhi 5fc03a14a4 优化cp添加 5 years ago
chenzhi 0dda3b1c61 优化合同不需要限制时间 5 years ago
chenzhi 490197a490 移除合作方合同时间限制 5 years ago
chenzhi f7d67ff4c4 新增合作方阿里账号及用户 5 years ago
chenzhi 42a17754e4 修改查看 5 years ago
zhengyongxing 7a96d4b6c0 Merge branch 'feature/modify_bug' into fix/admin_second_optimization 5 years ago
zhengyongxing 1f0cfca3ce 管理后台推广公司管理及合作方管理部分文字修改 5 years ago
zhengyongxing 742d3b5470 管理后台推广公司管理及合作方管理部分文字修改 5 years ago
chenzhi 50462e3470 优化合作方必填项 5 years ago
zhengyongxing 2933d2d223 管理后台文字修正 5 years ago
chenzhi 289b99c293 合作方管理页面文字错误 5 years ago
zhengyongxing 0ebde4cb17 导出权限修正 5 years ago
liuweiwen e243675bcc 将子窗口的方法转到ajax控制器 5 years ago