郑永星
|
b65b8c6b2f
|
Merge branch 'hotfix/payStatistic' of wmtx/platform into release
判定是否录入过修正
|
4 years ago |
zhengyongxing
|
229d8d2a50
|
判定是否录入过修正
|
4 years ago |
|
郑永星
|
a80f68ef5e
|
Merge branch 'hotfix/payStatistic' of wmtx/platform into release
补点比例非负数修正
|
4 years ago |
|
zhengyongxing
|
df3b058b91
|
补点比例非负数修正
|
4 years ago |
 廖金灵
|
9a2630093a
|
Merge branch 'hotfix/payStatistic' of wmtx/platform into master
补点功能修正
|
4 years ago |
|
郑永星
|
98563b686d
|
Merge branch 'hotfix/payStatistic' of wmtx/platform into release
补点功能修正
|
4 years ago |
|
zhengyongxing
|
c7af3bdb1d
|
补点功能修正
|
4 years ago |
chenzhi
|
bcdbb3d0a0
|
优化导出保留两位小数
|
4 years ago |
|
zhengyongxing
|
c0406a6f52
|
上游导出修正
|
4 years ago |
|
chenzhi
|
e085b6cc78
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
|
4 years ago |
|
chenzhi
|
f73a9033b3
|
新增下游个人比例
|
4 years ago |
|
廖金灵
|
1b9aa5c87e
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
补点游戏有流水的就给予展示
|
4 years ago |
|
zhengyongxing
|
af5878a98f
|
补点游戏有流水的就给予展示
|
4 years ago |
|
廖金灵
|
de3477dd27
|
Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
补点功能修正
|
4 years ago |
|
zhengyongxing
|
b39629fe08
|
补点功能修正
|
4 years ago |
|
郑永星
|
223c3a63f2
|
Merge branch 'hotfix/payStatistic' of wmtx/platform into release
支付渠道优化
|
4 years ago |
|
zhengyongxing
|
64e2517b93
|
支付渠道优化
|
4 years ago |
|
chenzhi
|
329c5696d6
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
|
4 years ago |
|
chenzhi
|
d7b9a0ac1a
|
优化允许撤销汇总进行直接汇总
|
4 years ago |
|
郑永星
|
c9497ee3f3
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
比例格式修正
|
4 years ago |
|
zhengyongxing
|
3adf8a93f8
|
比例格式修正
|
4 years ago |
|
chenzhi
|
e10b27a067
|
优化下游内团江息网络归属
|
4 years ago |
万盟天下
|
956d6c35a7
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into master
优化
|
4 years ago |
|
万盟天下
|
9d6b18009a
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
优化
|
4 years ago |
|
ELF
|
4bb7015e1b
|
测试
|
4 years ago |
|
万盟天下
|
25c06c4b2d
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改功能
|
4 years ago |
|
万盟天下
|
eb7346c4a9
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into master
权限优化
|
4 years ago |
|
ELF
|
f37f6c51dd
|
修改功能
|
4 years ago |
|
chenzhi
|
2ff538886c
|
优化上游结算
|
4 years ago |
|
郑永星
|
700841fe7f
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点与其他汇总重算功能区分添加限制
|
4 years ago |
|
chenzhi
|
75c7b635b6
|
优化上游结算检索
|
4 years ago |
|
万盟天下
|
ae44e80233
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into master
特殊补点与其他汇总重算功能区分添加限制
|
4 years ago |
|
zhengyongxing
|
7a04411e4d
|
特殊补点与其他汇总重算功能区分添加限制
|
4 years ago |
|
郑永星
|
7a9a12f99c
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点无法重算限制
|
4 years ago |
|
zhengyongxing
|
e94994993a
|
特殊补点无法重算限制
|
4 years ago |
|
郑永星
|
c4ea44c3f8
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点权限
|
4 years ago |
|
廖金灵
|
ef5c95f49a
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
优化
|
4 years ago |
|
廖金灵
|
548c76bd99
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into master
优化
|
4 years ago |
|
ELF
|
1b949af7f5
|
优化
|
4 years ago |
|
廖金灵
|
cf821ae447
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into master
特殊补点权限
|
4 years ago |
|
zhengyongxing
|
ba80668560
|
特殊补点权限
|
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 |
|
郑永星
|
10e50b4bec
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
比例与日期格式修正
|
4 years ago |
|
zhengyongxing
|
f18f3ce7e2
|
比例与日期格式修正
|
4 years ago |
陈志
|
0c696fd8a5
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
|
4 years ago |
|
陈志
|
4813e28fec
|
Merge branch 'feature/finance_statement_three' 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 |
|
chenzhi
|
b899ff7af7
|
优化汇总说明
|
4 years ago |
|
ELF
|
bdc23b7d90
|
修改
|
4 years ago |
|
廖金灵
|
de9367618b
|
Merge branch 'feature/agg_game_fail' of wmtx/platform into release
优化
|
4 years ago |
|
ELF
|
1fb2fa7e81
|
解决冲突
|
4 years ago |
|
ELF
|
8d98bd5a36
|
优化
|
4 years ago |
|
ELF
|
d123f7b779
|
优化
|
4 years ago |
|
廖金灵
|
6a78824b10
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
|
4 years ago |
|
郑永星
|
e554d9c288
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点加入下游结算中
|
4 years ago |
|
zhengyongxing
|
19c7f7db0d
|
特殊补点加入下游结算中
|
4 years ago |
|
郑永星
|
1aebf2b939
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点分成金额功能修正
|
4 years ago |
|
zhengyongxing
|
eac0fc61c0
|
特殊补点分成金额功能修正
|
4 years ago |
|
ELF
|
268e084241
|
修改
|
4 years ago |
|
陈志
|
e1db5c9a47
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化重算按钮的出现
|
4 years ago |
|
chenzhi
|
ae9d7f7574
|
优化重算按钮的出现
|
4 years ago |
|
郑永星
|
7c5ec40288
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点bug修正
|
4 years ago |
|
zhengyongxing
|
a29a8e43ff
|
特殊补点bug修正
|
4 years ago |
|
廖金灵
|
931c837d7e
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
优化
|
4 years ago |
|
ELF
|
9d67a4c842
|
优化
|
4 years ago |
|
郑永星
|
e3850d18f5
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
平台结算导出与列表选项修改
|
4 years ago |
|
zhengyongxing
|
a146dd820a
|
平台结算导出与列表选项修改
|
4 years ago |
|
chenzhi
|
8baab09004
|
优化备注
|
4 years ago |
|
陈志
|
aa2feb7e1e
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化海南结算
|
4 years ago |
|
chenzhi
|
927c5b8595
|
优化海南结算
|
4 years ago |
|
chenzhi
|
a3a3505894
|
新增官方渠道结算
|
4 years ago |
|
郑永星
|
9f0f9b7951
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
市场专员业绩下游流水及特殊补点功能提交
|
4 years ago |
|
zhengyongxing
|
b14d2d197c
|
市场专员业绩下游流水及特殊补点功能提交
|
4 years ago |
|
廖金灵
|
d29ec01ab6
|
Merge branch 'feature/agg_game_fail' of wmtx/platform into release
修改
|
4 years ago |
|
ELF
|
b9779df6b1
|
修改
|
4 years ago |
|
廖金灵
|
429ded27b8
|
Merge branch 'feature/agg_game_fail' of wmtx/platform into release
修改
|
4 years ago |
|
ELF
|
0ff1089682
|
修改
|
4 years ago |
|
廖金灵
|
c633109176
|
Merge branch 'feature/agg_game_fail' of wmtx/platform into release
留存率不区分设备
|
4 years ago |
|
ELF
|
619e1de3f3
|
留存率不区分设备
|
4 years ago |
|
陈志
|
c1fbda369b
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化财务汇总测试收入
|
4 years ago |
|
廖金灵
|
7436e7c89d
|
Merge branch 'feature/agg_game_fail' of wmtx/platform into release
测试订单优化
|
4 years ago |
|
ELF
|
3c3222ad26
|
测试订单优化
|
4 years ago |
|
chenzhi
|
eb2cd7d50f
|
优化财务汇总测试收入
|
4 years ago |
|
陈志
|
d130e6cf6d
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化个人汇总导出异常
|
4 years ago |
|
chenzhi
|
f405faa924
|
优化个人汇总导出异常
|
4 years ago |
|
陈志
|
053d1de648
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化个人结算
|
4 years ago |
|
chenzhi
|
1a55fbce69
|
优化个人结算
|
4 years ago |
|
廖金灵
|
151fa30be5
|
Merge branch 'feature/agg_game_fail' of wmtx/platform into release
聚合订单查询
|
4 years ago |
|
ELF
|
a18e4188bd
|
修改bug
|
4 years ago |
|
chenzhi
|
05f11648a0
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
|
4 years ago |
|
郑永星
|
f0153776c3
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊比例功能修正
|
4 years ago |
|
zhengyongxing
|
3b2ddded90
|
特殊比例功能修正
|
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 |
|
chenzhi
|
31af865a9f
|
优化线下打款确认
|
4 years ago |
|
郑永星
|
3bc318daf3
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊比例申请功能提交
|
4 years ago |