elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,547 Commits
1 Branch
0 Tags
173 MiB
Commit Graph

3521 Commits (a2b085562d791485bc18e8f1c4aeec4cd13133b4)

Author SHA1 Message Date
zhengyongxing 1f3b2d1ec7 Merge branch 'feature/new_item' of 47.111.118.107:wmtx/platform into feature/add_item
zhengyongxing 0631c22c93 上游导出修正
zyx 570e476efb 公司添加是否为内部公司
zhengyongxing deeb4b865b 聚合汇总单代码提交
zhengyongxing f95b593455 Merge remote-tracking branch 'origin/feature/company_export_change' into feature/company_export_change 
# Conflicts:
#	Application/Base/Tool/AggregateClient.class.php
#	Data/update.sql
zhengyongxing 400a9b3ded 上游导出修正
zhengyongxing 3c698adba9 上游导出修正
chenzhi 97af14147e 优化下游个人结算
万盟天下 f52cf8947a Merge branch 'hotfix/bug_change_now' of wmtx/platform into master 
补点游戏生成多条及内充也计入
zhengyongxing cdb02aa821 补点游戏生成多条及内充也计入
廖金灵 ef891050c9 Merge branch 'hotfix/platform_coin_fix' of wmtx/platform into release 
修改bug
ELF baba28fe04 修改
郑永星 55f98ca8c5 Merge branch 'hotfix/bug_change_now' of wmtx/platform into release 
删除提示修正
zhengyongxing 623361cbde 删除提示修正
郑永星 77e8161159 Merge branch 'hotfix/bug_change_now' of wmtx/platform into release 
汇总删除修正
zhengyongxing d35ce5694e 汇总删除修正
zhengyongxing f36469031e 删除修正
zhengyongxing c5e272fb36 删除功能修正
陈志 5cb1963582 Merge branch 'feature/finance_statement_three' of wmtx/platform into release 
优化推广公司添加排序
chenzhi f169d65c1c 优化推广公司添加排序
廖金灵 f850a45913 Merge branch 'hotfix/platform_coin_fix' of wmtx/platform into release 
优化推广后台资料专区
ELF a6d7adb87b 修改
chenzhi 4a3cb6f6bb Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
郑永星 7469d22c36 Merge branch 'hotfix/bug_change_now' of wmtx/platform into release 
比例空字符判断
zhengyongxing 9579919375 比例空字符判断
郑永星 d272c17fc6 Merge branch 'hotfix/bug_change_now' of wmtx/platform into release 
特殊补点比例修正
zhengyongxing c1222cd46a 特殊补点比例修正
zhengyongxing a5090c3793 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/bug_change_now_other
zhengyongxing 7ef0f125c1 特殊补点删除功能提交
zhengyongxing 47e373639d Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/bug_change_now
廖金灵 6e34bf0dc0 Merge branch 'hotfix/bug_change_now' of wmtx/platform into release 
公司支付宝打款修正
zhengyongxing ba1778c112 公司支付宝打款修正
郑永星 c7ba3e3ba3 Merge branch 'hotfix/bug_change_now' of wmtx/platform into release 
补点bug修正
zhengyongxing ab7ae80634 补点bug修正
郑永星 2e4904861b Merge branch 'hotfix/bug_change_now' of wmtx/platform into release 
特殊补点功能bug修正
zhengyongxing 65dc1dec9e 特殊补点功能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 
判定是否录入过修正
郑永星 b65b8c6b2f Merge branch 'hotfix/payStatistic' of wmtx/platform into release 
判定是否录入过修正
zhengyongxing 229d8d2a50 判定是否录入过修正
郑永星 a80f68ef5e Merge branch 'hotfix/payStatistic' of wmtx/platform into release 
补点比例非负数修正
zhengyongxing df3b058b91 补点比例非负数修正
廖金灵 9a2630093a Merge branch 'hotfix/payStatistic' of wmtx/platform into master 
补点功能修正
郑永星 98563b686d Merge branch 'hotfix/payStatistic' of wmtx/platform into release 
补点功能修正
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 新增下游个人比例
廖金灵 1b9aa5c87e Merge branch 'hotfix/bug_change_now' of wmtx/platform into release 
补点游戏有流水的就给予展示
zhengyongxing af5878a98f 补点游戏有流水的就给予展示
廖金灵 de3477dd27 Merge branch 'hotfix/bug_change_now' of wmtx/platform into release 
补点功能修正
zhengyongxing b39629fe08 补点功能修正
郑永星 223c3a63f2 Merge branch 'hotfix/payStatistic' of wmtx/platform into release 
支付渠道优化
zhengyongxing 64e2517b93 支付渠道优化
chenzhi 329c5696d6 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
chenzhi d7b9a0ac1a 优化允许撤销汇总进行直接汇总
郑永星 c9497ee3f3 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
比例格式修正
zhengyongxing 3adf8a93f8 比例格式修正
chenzhi e10b27a067 优化下游内团江息网络归属
万盟天下 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 
上游导出修正
郑永星 1d3db74b53 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
上游导出修正
zhengyongxing 288078c959 上游导出修正
chenzhi 2ff538886c 优化上游结算
郑永星 700841fe7f Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
特殊补点与其他汇总重算功能区分添加限制
chenzhi 75c7b635b6 优化上游结算检索
万盟天下 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
ELF 8f4b86ee2e 优化
郑永星 7a9a12f99c Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
特殊补点无法重算限制
zhengyongxing e94994993a 特殊补点无法重算限制
郑永星 c4ea44c3f8 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
特殊补点权限
廖金灵 ef5c95f49a Merge branch 'feature/promote_company_merge' of wmtx/platform into release 
优化
廖金灵 548c76bd99 Merge branch 'feature/promote_company_merge' of wmtx/platform into master 
优化
ELF 1b949af7f5 优化
廖金灵 cf821ae447 Merge branch 'hotfix/market_percentage' of wmtx/platform into master 
特殊补点权限
zhengyongxing ba80668560 特殊补点权限
chenzhi 9c11344906 优化下游推广公司导出
郑永星 3310553654 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
比例格式修正
zhengyongxing 1c08d1a221 比例格式修正
郑永星 10e50b4bec Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
比例与日期格式修正
zhengyongxing f18f3ce7e2 比例与日期格式修正
陈志 0c696fd8a5 Merge branch 'feature/promote_company_merge' of wmtx/platform into release 
修改
陈志 4813e28fec Merge branch 'feature/finance_statement_three' of wmtx/platform into release 
优化汇总说明
郑永星 ff1117c0b7 Merge branch 'hotfix/market_percentage' of wmtx/platform into release 
小bug修改
zhengyongxing 5acd5197ae 小bug修改
chenzhi b899ff7af7 优化汇总说明
ELF bdc23b7d90 修改
廖金灵 a6bc59dd53 Merge branch 'feature/promote_company_merge' of wmtx/platform into release 
测试
ELF 1e5c0cca66 测试
廖金灵 de9367618b Merge branch 'feature/agg_game_fail' of wmtx/platform into release 
优化
ELF 1fb2fa7e81 解决冲突