180 Commits (e337ecac5eb7e14d540ca7d6425b774516269759)

Author SHA1 Message Date
zhengyongxing 53979941a0 列表全部开发给市场专员,其他人员的数据隐藏 4 years ago
zhengyongxing 1acef89380 市场业绩提成市场总监管理组添加查看全部用户的权限 4 years ago
zhengyongxing 2975b9fe35 市场业绩提成优化 4 years ago
zhengyongxing 4bfa0dfa2f 市场专员业绩结算结构修改 4 years ago
zhengyongxing d40ce89901 市场专员业绩结算发放时间选项修改 4 years ago
zhengyongxing 9a23b5588b 市场专员业绩计算修正 4 years ago
zhengyongxing 97161900ac 市场专员业绩管理bug修改 4 years ago
zhengyongxing 80dc2b860c Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/market_percentage
 Conflicts:
	Application/Admin/Common/extend.php
	Application/Admin/Controller/TimingController.class.php
	Data/update.sql
4 years ago
zhengyongxing 83717b64ae 市场专员业绩管理优化 4 years ago
ELF 3f42d2967c 修改 4 years ago
zhengyongxing dbad9a08db Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_statistics
 Conflicts:
	Application/Admin/Common/function.php
	Application/Admin/Controller/TimingController.class.php
4 years ago
ELF 990a2bd206 解决冲突 4 years ago
ELF 8224cfb362 修改 4 years ago
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
4 years ago
zhengyongxing a8f4f16349 Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/view.html
#	Data/update.sql
4 years ago
zhengyongxing cd0d9e295f 市场专员结算代码上传 4 years ago
zhengyongxing 379716298a 市场专员结算代码上传 4 years ago
ELF f0a8b6bc3b 修改 4 years ago
ELF 76fcfec7c2 修改 4 years ago
ELF 5f5a6ee1af 修改 4 years ago
廖金灵 a808b86865 Merge branch 'feature/paytime_summary' of wmtx/platform into release
汇付宝
4 years ago
chenzhi 511f53e83c 优化权限 4 years ago
chenzhi 0ba02069a0 优化补点计算方式 4 years ago
zhengyongxing 9aed64f46d 推广员充值汇总优化,补单功能添加 4 years ago
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络 5 years ago
chenzhi e1d624fe8b 优化导出并聚合数据 5 years ago
chenzhi c5e3d78835 新增导出 5 years ago
chenzhi e80d4eb539 新增确认 5 years ago
chenzhi 93a8bb70e1 新增编辑 5 years ago
tping 9fd06c27d3 Merge branch 'hotfix/alipaytoalipay' into feature/platfrom_aggregate_finance
# Conflicts:
#	Data/update.sql
5 years ago
chenzhi 6162f9f8a1 生成上下游结算单 5 years ago
zhengyongxing 5f0b7a6de0 充值方式文字修正,金猪改成苹果 5 years ago
sunke d7e61edaa1 汇付宝 5 years ago
chenzhi afee89ec03 优化模板无聚合 5 years ago
chenzhi 6a3b9b6da3 新增游戏分成比例 5 years ago
chenzhi fd4e0baffd 新增游戏比例模板 5 years ago
sunke a4377c017e 支付设置 5 years ago
chenzhi 450ef803d6 合并 5 years ago
chenzhi 3e7778df35 优化零元问题 5 years ago
zhengyongxing 4d938b85f4 导出账号权限修改配置 5 years ago
zhengyongxing 0482836a8e 导出账号权限添加 5 years ago
廖金灵 bab7fec46d Merge branch 'fix/fiancecount_gamename_change' of wmtx/platform into release
游戏名称不含设备类型优化
5 years ago
chenzhi c45ca2942d 优化设备名称函数 5 years ago
chenzhi 6f7e0de83d 优化平台币设备,名称 5 years ago
chenzhi f0a19cfc99 优化设备名称为字典 5 years ago
chenzhi 9064fc7c58 游戏统计 游戏名称不含设备类型优化 5 years ago
chenzhi 55d49e8b4b 优化推广公会列表导出 5 years ago
chenzhi 1761d37b5c 推广公会列表 适配新内外团规则 5 years ago
chenzhi ccda6e0b39 开启操作日志 5 years ago
ELF 9e82faf6f3 关闭后台操作日志 5 years ago