Commit Graph

6422 Commits (c27a9702eea7203aeccc3249bcd1e2f7163423e9)
 

Author SHA1 Message Date
chenzhi c27a9702ee Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
廖金灵 74cfe5bcd3 Merge branch 'hotfix/platform_coin_fix' of wmtx/platform into master
修改bug
ELF 9f0c56d753 修改bug
chenzhi 7a135f1019 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
廖金灵 5e2c093ea4 Merge branch 'hotfix/payStatistic' of wmtx/platform into master
判定是否录入过修正
zhengyongxing 229d8d2a50 判定是否录入过修正
zhengyongxing df3b058b91 补点比例非负数修正
廖金灵 9a2630093a Merge branch 'hotfix/payStatistic' of wmtx/platform into master
补点功能修正
zhengyongxing c7af3bdb1d 补点功能修正
chenzhi bcdbb3d0a0 优化导出保留两位小数
zhengyongxing c0406a6f52 上游导出修正
chenzhi e085b6cc78 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
chenzhi f73a9033b3 新增下游个人比例
廖金灵 2ea6a3e72c Merge branch 'hotfix/bug_change_now' of wmtx/platform into master
补点游戏有流水的就给予展示
zhengyongxing af5878a98f 补点游戏有流水的就给予展示
廖金灵 7f8404b947 Merge branch 'hotfix/bug_change_now' of wmtx/platform into master
补点功能修正
zhengyongxing b39629fe08 补点功能修正
chenzhi 774c91570d Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
zhengyongxing 64e2517b93 支付渠道优化
chenzhi 329c5696d6 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
万盟天下 1cf104727d Merge branch 'feature/finance_statement_three' of wmtx/platform into master
优化允许撤销汇总进行直接汇总
chenzhi d7b9a0ac1a 优化允许撤销汇总进行直接汇总
郑永星 c9497ee3f3 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
比例格式修正
zhengyongxing 3adf8a93f8 比例格式修正
万盟天下 2e7caa0408 Merge branch 'feature/finance_statement_three' of wmtx/platform into master
优化下游内团江息网络归属
chenzhi e10b27a067 优化下游内团江息网络归属
万盟天下 0fb92bb0a0 Merge branch 'feature/finance_statement_three' of wmtx/platform into master
优化上游结算模板导出
chenzhi f92f59601d 优化上游结算模板导出
万盟天下 956d6c35a7 Merge branch 'feature/promote_company_merge' of wmtx/platform into master
优化
万盟天下 9d6b18009a Merge branch 'feature/promote_company_merge' of wmtx/platform into release
优化
ELF 4bb7015e1b 测试
万盟天下 25c06c4b2d Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改功能
万盟天下 eb7346c4a9 Merge branch 'feature/promote_company_merge' of wmtx/platform into master
权限优化
ELF f37f6c51dd 修改功能
万盟天下 c60d7c6671 Merge branch 'hotfix/market_percentage' of wmtx/platform into master
上游导出修正
万盟天下 0aaa817d8d Merge branch 'feature/finance_statement_three' of wmtx/platform into master
优化上游结算
郑永星 1d3db74b53 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
上游导出修正
zhengyongxing 288078c959 上游导出修正
chenzhi 2ff538886c 优化上游结算
万盟天下 948c0c149b Merge branch 'feature/finance_statement_three' of wmtx/platform into master
优化上游结算检索
郑永星 700841fe7f Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点与其他汇总重算功能区分添加限制
chenzhi 75c7b635b6 优化上游结算检索
万盟天下 e5d31aedf9 Merge branch 'feature/promote_company_merge' of wmtx/platform into master
xiugai
ELF 050eb98843 xiugai
万盟天下 19cd57c354 Merge branch 'feature/promote_company_merge' of wmtx/platform into master
修改
ELF 2c9092273f 修改
万盟天下 ae44e80233 Merge branch 'hotfix/market_percentage' of wmtx/platform into master
特殊补点与其他汇总重算功能区分添加限制
zhengyongxing 7a04411e4d 特殊补点与其他汇总重算功能区分添加限制
万盟天下 e130228c39 Merge branch 'feature/promote_company_merge' of wmtx/platform into release
优化
万盟天下 2f0ecf6302 Merge branch 'feature/promote_company_merge' of wmtx/platform into master
修改bug