chenzhi
|
669bfa8f25
|
暂存
|
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 |
|
chenzhi
|
380243dbb8
|
优化结算的补点
|
5 years ago |
|
chenzhi
|
4c0c51e0ae
|
上游结算ok
|
5 years ago |
|
chenzhi
|
fe7d21943b
|
暂存2
|
5 years ago |
|
chenzhi
|
c71c142227
|
暂存
|
5 years ago |
|
chenzhi
|
b4c93cc433
|
接口还原分离
|
5 years ago |
|
chenzhi
|
c59a314afe
|
优化聚合cp获取接口
|
5 years ago |
zhengyongxing
|
394ce7a544
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/ip_forbit
|
5 years ago |
|
zhengyongxing
|
9aae41fd20
|
ip封禁隐藏区域
|
5 years ago |
chenzhi
|
5c1a8d69a0
|
新增生效列表页面
|
5 years ago |
|
chenzhi
|
8a508c050d
|
新增编辑
|
5 years ago |
|
chenzhi
|
4b8538a3bb
|
新增审核操作
|
5 years ago |
|
chenzhi
|
f20cfde7c7
|
新增审核列表导出
|
5 years ago |
|
chenzhi
|
e684191b45
|
优化审核列表
|
5 years ago |
|
chenzhi
|
b5a604d385
|
优化添加
|
5 years ago |
|
chenzhi
|
e5dc86118e
|
新增优化
|
5 years ago |
|
chenzhi
|
1139b37a50
|
新增公司关系绑定
|
5 years ago |
|
chenzhi
|
3b8e7eb2b0
|
推广游戏分成管理ok
|
5 years ago |
|
chenzhi
|
a8fddb8f2f
|
优化游戏分成
|
5 years ago |
|
chenzhi
|
0d8ec00225
|
优化排序
|
5 years ago |
|
chenzhi
|
8a83e17485
|
新增导出
|
5 years ago |
|
chenzhi
|
4533b84d2c
|
权限
|
5 years ago |
|
zhengyongxing
|
0953eb4dd4
|
Merge branches 'feature/juhe_sms' and 'master' of 47.111.118.107:wmtx/platform into feature/juhe_sms
|
5 years ago |
|
chenzhi
|
6a3b9b6da3
|
新增游戏分成比例
|
5 years ago |
|
chenzhi
|
1c8ef3493d
|
优化比例模板
|
5 years ago |
|
chenzhi
|
c1283ebfeb
|
游戏比例模板导出删除
|
5 years ago |
|
chenzhi
|
adbc76c3ae
|
游戏模板修改
|
5 years ago |
|
chenzhi
|
3a8273283e
|
游戏比例模板新增
|
5 years ago |
|
chenzhi
|
9c1a12296d
|
优化合作公司列表显示
|
5 years ago |
|
chenzhi
|
982a7f4c1b
|
更新合作公司列表显示
|
5 years ago |
|
chenzhi
|
fd4e0baffd
|
新增游戏比例模板
|
5 years ago |
|
zhengyongxing
|
fba271cd64
|
Merge branches 'fix/admin_second_optimization' and 'master' of 47.111.118.107:wmtx/platform into fix/admin_second_optimization
|
5 years ago |
|
chenzhi
|
8b9a4e73fe
|
接口数据1
|
5 years ago |
|
zhengyongxing
|
1c5a02594a
|
身份认证后台添加
|
5 years ago |
|
chenzhi
|
e84d545a2d
|
Merge branch 'fix/admin_second_optimization' of 47.111.118.107:wmtx/platform into fix/admin_second_optimization
|
5 years ago |
|
zhengyongxing
|
e949f92434
|
ip限制操作日志添加
|
5 years ago |
 廖金灵
|
2d7189a224
|
Merge branch 'fix/admin_second_optimization' of wmtx/platform into master
优化空值修改
|
5 years ago |
|
chenzhi
|
42a9b318fb
|
优化空值修改5
|
5 years ago |
|
chenzhi
|
4ebe2780cc
|
优化空值修改4
|
5 years ago |
|
chenzhi
|
3b6f8c70cc
|
优化可以为空填写
|
5 years ago |
|
chenzhi
|
ba9468fedc
|
新增打款配置
|
5 years ago |
|
廖金灵
|
d99db944c5
|
Merge branch 'fix/admin_second_optimization' of wmtx/platform into master
bug修复及cp下游接口添加
|
5 years ago |
|
chenzhi
|
748ec401f3
|
新增打款配置1
|
5 years ago |
|
chenzhi
|
6c4319cfe2
|
Revert "暂存"
This reverts commit a685c14e23.
|
5 years ago |
|
chenzhi
|
a685c14e23
|
暂存
|
5 years ago |
|
chenzhi
|
ec4d180287
|
优化公会更改
|
5 years ago |
|
chenzhi
|
09e71420e0
|
优化推广员归属审核
|
5 years ago |
|
chenzhi
|
e1e431804c
|
优化审批
|
5 years ago |
|
chenzhi
|
6557938e53
|
优化聚合渠道财务结算单
|
5 years ago |
|
chenzhi
|
5ebdda1c85
|
修改合作方可为空
|
5 years ago |
|
chenzhi
|
50462e3470
|
优化合作方必填项
|
5 years ago |
|
chenzhi
|
35d8e379d8
|
优化操作行为日志隐藏玩家
|
5 years ago |
|
chenzhi
|
673e3fb5cd
|
角色权限修改状态提醒优化
|
5 years ago |
|
chenzhi
|
c93a8577c4
|
合并
|
5 years ago |
张谷诚
|
bb833deb98
|
Merge branch 'hotfix/test_resource_search' of wmtx/platform into master
测试资源搜索功能添加
|
5 years ago |
|
chenzhi
|
ae4c58b6fd
|
修改推广员流水可选填
|
5 years ago |
|
zhengyongxing
|
132b601f74
|
测试资源搜索功能添加
|
5 years ago |
|
zhengyongxing
|
878414aeb2
|
测试资源搜索修正
|
5 years ago |
|
张谷诚
|
c5f9a25a9e
|
Merge branch 'feature/export_authority' of wmtx/platform into release
导出bug修改
|
5 years ago |
|
zyx
|
ee9f53ce0b
|
导出权限bug修改
|
5 years ago |
|
zhengyongxing
|
301a5a7f5a
|
导出bug修改
|
5 years ago |
|
zhengyongxing
|
5e71728097
|
导出bug修改
|
5 years ago |
|
chenzhi
|
450ef803d6
|
合并
|
5 years ago |
|
chenzhi
|
861fd07965
|
优化检索
|
5 years ago |
|
chenzhi
|
834dbe0867
|
优化导出支付信息不记录
|
5 years ago |
|
zhengyongxing
|
1659c55ef2
|
用户行为日志修改
|
5 years ago |
|
zhengyongxing
|
0ca2f2a064
|
游戏统计导出修改
|
5 years ago |
|
chenzhi
|
2ad89c2fb6
|
优化导出时间
|
5 years ago |
|
chenzhi
|
5a9fc76374
|
申请编辑信息遮罩不关闭
|
5 years ago |
|
zhengyongxing
|
4d43e877a1
|
Merge branches 'feature/export_authority' and 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
Conflicts:
Data/update.sql
|
5 years ago |
|
zhengyongxing
|
acaebe0217
|
Merge branches 'feature/export_authority' and 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
Conflicts:
Data/update.sql
|
5 years ago |
|
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
|
5 years ago |
|
zhengyongxing
|
c58cdd31af
|
用户行为日志导出修正
|
5 years ago |
|
zhengyongxing
|
613d60e4a7
|
数据权限配置修改
|
5 years ago |
|
廖金灵
|
e88867abe5
|
Merge branch 'feature/aggregate_finance' of wmtx/platform into release
新增权限不验证
|
5 years ago |
|
chenzhi
|
973f7ca394
|
现在权限不验证
|
5 years ago |
|
廖金灵
|
ff5b2e3483
|
Merge branch 'feature/aggregate_finance' of wmtx/platform into release
聚合财务结算单
|
5 years ago |
|
chenzhi
|
21a985ae82
|
聚合财务结算单ok
|
5 years ago |
|
zhengyongxing
|
4f88cd025e
|
绑币导出修正
|
5 years ago |
|
chenzhi
|
8137778ec1
|
新增聚合操作日志
|
5 years ago |
|
zhengyongxing
|
38f478d63d
|
数据调整修改
|
5 years ago |
|
zhengyongxing
|
8d7dbe5469
|
测试资源修改
|
5 years ago |
|
zhengyongxing
|
727b335b45
|
测试资源修改
|
5 years ago |
|
chenzhi
|
63f5354dc3
|
优化重算
|
5 years ago |
|
zhengyongxing
|
5dbd0eb8fa
|
业绩配置修改
|
5 years ago |
|
zhengyongxing
|
a9ce0585cc
|
测试资源配置
|
5 years ago |
|
chenzhi
|
2a28cf9008
|
聚合财务优化权限
|
5 years ago |
|
zhengyongxing
|
b768d41935
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
Conflicts:
Application/Home/Controller/PackageController.class.php
|
5 years ago |
|
chenzhi
|
fe662ce160
|
审核子操作ok
|
5 years ago |
|
zhengyongxing
|
b6b97c130d
|
测试资源代码修正
|
5 years ago |
|
chenzhi
|
16d9813e18
|
聚合财务重算
|
5 years ago |
|
zhengyongxing
|
a9e6dafad3
|
行为日志修正
|
5 years ago |
|
chenzhi
|
253b47b2a9
|
聚合财务子操作
|
5 years ago |
|
chenzhi
|
990c62b06a
|
批注增删改查
|
5 years ago |
|
chenzhi
|
6b5f60f8e6
|
新增凭证增删改查
|
5 years ago |
|
chenzhi
|
afd362d847
|
聚合结算单导出优化3
|
5 years ago |
|
chenzhi
|
2fc38b25b6
|
聚合结算单导出优化2
|
5 years ago |
|
chenzhi
|
ce4c938080
|
优化聚合结算导出
|
5 years ago |