3289 Commits (02150820185fabd61b744c135d81fda0cad2247f)

Author SHA1 Message Date
zhengyongxing 0215082018 特殊补点bug修正 4 years ago
zhengyongxing 3022525c85 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Application/Admin/Controller/CompanyStatementPoolController.class.php
4 years ago
zhengyongxing cd331f2c64 上下游聚合打款信息修改 4 years ago
chenzhi 9234919180 优化导出 4 years ago
chenzhi 6cb4ecb930 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three 4 years ago
zhengyongxing 2c005d1996 特殊补点汇总功能修改 4 years ago
zhengyongxing 4ed51cb112 上下游聚合打款信息修改 4 years ago
chenzhi c795e5de6c 优化下游个人汇总样式 4 years ago
zhengyongxing f4aeae340d 特殊补点功能修正 4 years ago
zhengyongxing 565d3c9576 特殊补点功能修改 4 years ago
zhengyongxing 73dff8839e Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Application/Admin/Controller/CompanyStatementPoolController.class.php
4 years ago
陈志 8fbf101e88 Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化汇总导出错误
4 years ago
chenzhi ce5a83e9bc 优化汇总导出错误 4 years ago
zhengyongxing 50495e73ca 特殊补点功能修改 4 years ago
zhengyongxing 6103908d83 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Application/Admin/Controller/CompanyStatementController.class.php
	Application/Admin/Controller/CompanyStatementPoolController.class.php
4 years ago
zhengyongxing 872de1ff73 上下游聚合打款信息修改 4 years ago
zhengyongxing b75e0725a1 特殊补点功能修改 4 years ago
zhengyongxing 9265d7c9b6 上下游聚合打款信息修改 4 years ago
陈志 fbdab69c71 Merge branch 'hotfix/add_company_partner' of wmtx/platform into release
优化上游添加错误
4 years ago
chenzhi 57b692cd67 优化上游添加错误 4 years ago
chenzhi 180332ab87 优化下游未汇总导出 4 years ago
chenzhi 4a98c587fa 新增线下打款确认 4 years ago
chenzhi 69cf42e895 新增线下确认打款 4 years ago
chenzhi e2d179acd8 新增线下打款 4 years ago
zhengyongxing 9000533644 下游公司功能提交 4 years ago
zhengyongxing 24e33ed8ba Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Data/update.sql
4 years ago
chenzhi b35d0a0e95 新增删除日志 4 years ago
chenzhi 79468aa6f2 新增结算删除 4 years ago
chenzhi 36d72848bb 优化市场专员 4 years ago
chenzhi a18df8c6fb 优化下游个人多比例结算 4 years ago
chenzhi ed66facc8f 优化结算查看 4 years ago
zyx 89801c1467 特殊补点功能完善 4 years ago
zhengyongxing e6bc6853aa 特殊补点结算功能添加 4 years ago
chenzhi ff19f3259f 优化下游公司多比例结算 4 years ago
chenzhi 492d7a8f73 优化获取比例 4 years ago
chenzhi f5fb65e400 新增获取公司游戏比例 4 years ago
chenzhi 8e2f07db38 优化系统任务注释 4 years ago
chenzhi 4f70b89063 优化系统任务执行 4 years ago
chenzhi b88f2986bd 优化重算,兼容wind 4 years ago
chenzhi 7ceafb1d42 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three 4 years ago
chenzhi 6e49bcc353 优化财务汇总 4 years ago
chenzhi 8b82fff791 优化任务插入 4 years ago
chenzhi 62b566e8b8 优化地址填写 4 years ago
chenzhi f0e43df7c2 新增重算 4 years ago
chenzhi fb75494c64 新增系统执行命令方法 4 years ago
廖金灵 35d34d1864 Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
bug修复
4 years ago
ELF c7390f4c2e bug修复 4 years ago
廖金灵 79af51d27b Merge branch 'hotfix/test_resource_new' of wmtx/platform into master
测试资源发放
4 years ago
chenzhi f5ad1a6d0c Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three 4 years ago
chenzhi 9f06436207 优化转换注释 4 years ago