 廖金灵
|
37a84b8ce7
|
Merge branch 'feature/company_game_rotio_perm' of wmtx/platform into release
修改推广游戏分成市场专员权限控制
|
4 years ago |
zhengyongxing
|
f9503182da
|
市场结算管理优化
|
4 years ago |
|
廖金灵
|
613b50eb63
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
支付渠道跳转增加
|
4 years ago |
|
zhengyongxing
|
f18db12d69
|
支付渠道跳转增加
|
4 years ago |
|
廖金灵
|
c8af2d79ff
|
Merge branch 'feature/deposit' of wmtx/platform into release
修改时间问题
|
4 years ago |
|
廖金灵
|
a2474aaa0b
|
Merge branch 'feature/reward' of wmtx/platform into release
修改时间
|
4 years ago |
yulingwei
|
b1a91339cb
|
Merge branch 'feature/deposit' of 47.111.118.107:wmtx/platform into feature/deposit
|
4 years ago |
|
yulingwei
|
1634f14fb2
|
upt
|
4 years ago |
|
yulingwei
|
a01beb9bc6
|
upt
|
4 years ago |
郑永星
|
f01030ffaa
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
|
4 years ago |
|
zhengyongxing
|
d9d66dc5bf
|
支付渠道跳转增加
|
4 years ago |
陈志
|
575c074c39
|
Merge branch 'fix/change_statement_time' of wmtx/platform into release
|
4 years ago |
chenzhi
|
b63369cdba
|
优化结算方式查询
|
4 years ago |
|
chenzhi
|
c6b3d1948e
|
优化打款剔除后显示
|
4 years ago |
|
廖金灵
|
697dad95c8
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
支付渠道跳转增加
|
5 years ago |
|
zhengyongxing
|
4c582e51c7
|
支付渠道跳转增加
|
5 years ago |
|
廖金灵
|
d6790fdf6c
|
Merge branch 'feature/plateform_statistics' of wmtx/platform into release
修改导出问题
|
5 years ago |
|
yulingwei
|
08400bd67a
|
upt
|
5 years ago |
|
廖金灵
|
86b8682d02
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
支付渠道跳转增加
|
5 years ago |
|
zhengyongxing
|
0c4f1f05bd
|
支付渠道跳转增加
|
5 years ago |
|
廖金灵
|
fc7284de94
|
Merge branch 'feature/reward' of wmtx/platform into release
奖罚样式问题
|
5 years ago |
|
廖金灵
|
d73ab9c4cd
|
Merge branch 'feature/payment_merchant' of wmtx/platform into release
完善支付商户操作日志
|
5 years ago |
|
陈志
|
f63985ece1
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
市场结算管理bug修改
|
5 years ago |
|
ELF
|
a4d4a51a2c
|
完善支付商户操作日志
|
5 years ago |
|
chenzhi
|
3318298d2e
|
优化上下游导出时间
|
5 years ago |
|
zhengyongxing
|
9a722d5b45
|
市场结算管理bug修改
|
5 years ago |
|
yulingwei
|
de0fc5e074
|
upt
|
5 years ago |
|
chenzhi
|
6f75b0e6d8
|
优化结算单无地址
|
5 years ago |
|
chenzhi
|
493197fed2
|
优化重新结算
|
5 years ago |
|
chenzhi
|
91510679b0
|
Merge branch 'fix/change_compnay_info0729' of 47.111.118.107:wmtx/platform into fix/change_statement_time
|
5 years ago |
|
chenzhi
|
853c938edb
|
优化下游个人结算时间
|
5 years ago |
|
chenzhi
|
92ccc96dcd
|
优化下游公司结算时间审核
|
5 years ago |
|
chenzhi
|
a14f0abb88
|
上游新增结算时间判断
|
5 years ago |
|
廖金灵
|
57ea4efb72
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
充值订单bug修改
|
5 years ago |
|
zhengyongxing
|
8c237e19fe
|
充值订单bug修改
|
5 years ago |
|
廖金灵
|
79f038d62a
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
付商户bug修改
|
5 years ago |
|
zhengyongxing
|
24bcd381a0
|
支付商户bug修改
|
5 years ago |
|
chenzhi
|
0f284cf9b3
|
优化游戏绑定，已经绑定不出现
|
5 years ago |
|
zhengyongxing
|
a960e0a7e4
|
商户bug修改
|
5 years ago |
|
zhengyongxing
|
624a2b7cde
|
商户bug修改
|
5 years ago |
|
zhengyongxing
|
9a202a393e
|
商户bug修改
|
5 years ago |
|
zhengyongxing
|
ee5fc4c7c8
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
Conflicts:
Application/Admin/View/Spend/lists.html
|
5 years ago |
|
zhengyongxing
|
9670bf86b6
|
商户bug修改
|
5 years ago |
|
廖金灵
|
7340d5b4fd
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
手机号码重复验证
|
5 years ago |
|
zhengyongxing
|
45d124b4cd
|
手机号码重复验证
|
5 years ago |
|
ELF
|
edb090feca
|
解决冲突
|
5 years ago |
|
ELF
|
004b540a63
|
解决冲突
|
5 years ago |
|
ELF
|
0803b686c3
|
解决冲突
|
5 years ago |
|
廖金灵
|
9e3de695ca
|
Merge branch 'feature/plateform_statistics' of wmtx/platform into release
市场部统计修改
|
5 years ago |
|
廖金灵
|
e4ab39bf64
|
Merge branch 'feature/ip_search' of wmtx/platform into release
IP查询
|
5 years ago |
|
廖金灵
|
54ad7191b1
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
聚合公司及增加手机登录功能
|
5 years ago |
|
廖金灵
|
2ea819c585
|
Merge branch 'feature/finance_statement723' of wmtx/platform into release
新增防止并发请求数据
|
5 years ago |
|
廖金灵
|
949570abf4
|
Merge branch 'feature/game_agg' of wmtx/platform into release
游戏统计显示聚合数据
|
5 years ago |
|
ELF
|
ff47282287
|
修改
|
5 years ago |
|
chenzhi
|
5ef1aa6e22
|
新增防止并发请求数据
|
5 years ago |
|
ELF
|
e0f71b67c5
|
处理
|
5 years ago |
|
zhengyongxing
|
4f681f7d72
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
Conflicts:
Data/update.sql
|
5 years ago |
|
陈志
|
d5c54234b3
|
Merge branch 'feature/finance_statement723' of wmtx/platform into release
|
5 years ago |
|
chenzhi
|
e3022cb6c2
|
关闭测试验证码
|
5 years ago |
|
ELF
|
6f8b93a26b
|
修改
|
5 years ago |
|
zhengyongxing
|
11ff884e6a
|
Merge branch 'feature/cp_juhe_company' into hotfix/market_percentage
# Conflicts:
# Application/Admin/Common/extend.php
# Application/Admin/Controller/AggregateFinanceSetController.class.php
# Application/Admin/Controller/CpJuheCompanyController.class.php
# Application/Admin/View/CpJuheCompany/detail.html
# Application/Admin/View/CpJuheCompany/export.html
# Data/update.sql
|
5 years ago |
|
zhengyongxing
|
91178308f9
|
下游公司字段与上游公司字段一致
|
5 years ago |
|
陈志
|
e01c7e4e01
|
Merge branch 'feature/finance_statement723' of wmtx/platform into release
|
5 years ago |
|
chenzhi
|
69615c1459
|
优化脚本执行
|
5 years ago |
|
chenzhi
|
0e8730b810
|
优化重算需重新确认
|
5 years ago |
|
ELF
|
56282658fc
|
解决冲突
|
5 years ago |
|
ELF
|
0206a422f9
|
解决冲突
|
5 years ago |
|
ELF
|
fbe8d7a351
|
修改bug
|
5 years ago |
|
chenzhi
|
fe1853065a
|
优化结算原包名显示
|
5 years ago |
|
chenzhi
|
8de452c8f7
|
优化名称显示
|
5 years ago |
chenzhi
|
f4be3972b2
|
优化结算单确认
|
5 years ago |
|
chenzhi
|
b7409ab069
|
优化导出
|
5 years ago |
|
chenzhi
|
eb311348a8
|
优化检索
|
5 years ago |
|
chenzhi
|
47b54d336c
|
优化汇总撤回
|
5 years ago |
|
chenzhi
|
2a303cf0f5
|
优化审核流程
|
5 years ago |
|
chenzhi
|
0aac0cfad7
|
新增结算类型
|
5 years ago |
|
chenzhi
|
31b1c771a1
|
新增全量查看
|
5 years ago |
|
chenzhi
|
a69b21dd14
|
汇总单新增周月结审核
|
5 years ago |
|
chenzhi
|
3ef8061e3e
|
优化个人0值重算
|
5 years ago |
|
chenzhi
|
6b9358c651
|
优化结算
|
5 years ago |
|
chenzhi
|
3cbc769bce
|
优化个人结算
|
5 years ago |
|
chenzhi
|
f70d8cb8a7
|
优化个人结算
|
5 years ago |
|
chenzhi
|
7f01c3ff39
|
优化上游结算方式
|
5 years ago |
|
chenzhi
|
f91b2a5dce
|
优化下游结算
|
5 years ago |
|
chenzhi
|
d946a4c91c
|
优化下游公司结算
|
5 years ago |
|
chenzhi
|
8e77f3ed4d
|
优化上游结算
|
5 years ago |
|
chenzhi
|
16a3bea172
|
优化上游新增服务器费用结算包名
|
5 years ago |
|
chenzhi
|
51c4b07eea
|
优化上游结算包名
|
5 years ago |
|
chenzhi
|
2de8e4a313
|
开启测试验证码
|
5 years ago |
|
chenzhi
|
b0034d5f19
|
优化推广公司游戏申请不审核
|
5 years ago |
|
chenzhi
|
a948986b41
|
优化上游导出
|
5 years ago |
|
chenzhi
|
5c857840a2
|
分成比例新增生效检索
|
5 years ago |
|
chenzhi
|
94a3057013
|
新增游戏分成比例导出
|
5 years ago |
|
chenzhi
|
ac65098827
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement723
|
5 years ago |
|
廖金灵
|
5f0917220c
|
Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
推广分成特殊申请
|
5 years ago |
|
chenzhi
|
8e4541cb01
|
推广分成特殊申请
|
5 years ago |
|
廖金灵
|
c67cbc61c2
|
Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
优化电话不限制
|
5 years ago |
|
chenzhi
|
0430293bb7
|
优化电话不限制
|
5 years ago |
|
廖金灵
|
4869d650d9
|
Merge branch 'feature/cp_juhe_company' of wmtx/platform into release
时间格式修正，导出格式修改
|
5 years ago |
|
zhengyongxing
|
815e2e3b88
|
时间格式修正，导出格式修改
|
5 years ago |