Commit Graph

6732 Commits (80b148d6c58adaf238a4d9eb2a30fb2fede63275)
 

Author SHA1 Message Date
zhengyongxing ab9be65422 内部公司功能提交
zhengyongxing 1f3b2d1ec7 Merge branch 'feature/new_item' of 47.111.118.107:wmtx/platform into feature/add_item
ELF 02c4b00bfe 优化
zhengyongxing 0631c22c93 上游导出修正
ELF 919791c0c7 推广后台优化
ELF df933cc6b1 修改
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 上游导出修正
万盟天下 3397319a36 Merge branch 'hotfix/download_domain_fix' of wmtx/platform into release
落地页域名后台配置功能
ELF 518009134a Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/download_domain_fix
ELF 16122d5d9f 修改
万盟天下 0c4211a951 Merge branch 'feature/finance_statement_three' of wmtx/platform into master
优化下游个人结算
chenzhi 97af14147e 优化下游个人结算
万盟天下 f52cf8947a Merge branch 'hotfix/bug_change_now' of wmtx/platform into master
补点游戏生成多条及内充也计入
郑永星 3a03b2ba10 Merge branch 'hotfix/bug_change_now' of wmtx/platform into release
补点游戏生成多条及内充也计入
zhengyongxing cdb02aa821 补点游戏生成多条及内充也计入
万盟天下 2f43461380 Merge branch 'release' of wmtx/platform into master
小版本更新
廖金灵 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 修改
陈志 e6b715faab Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化导出保留两位小数
chenzhi 4a3cb6f6bb Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
chenzhi c27a9702ee Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
ELF 5a184bbee1 功能优化
郑永星 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 特殊补点比例修正
郑永星 44cadaf725 Merge branch 'hotfix/bug_change_now_other' of wmtx/platform into release
特殊补点删除功能提交
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
廖金灵 fb9de0e39b Merge branch 'hotfix/platform_coin_fix' of wmtx/platform into release
修改bug
廖金灵 74cfe5bcd3 Merge branch 'hotfix/platform_coin_fix' of wmtx/platform into master
修改bug
ELF 9f0c56d753 修改bug
廖金灵 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修正