5890 Commits (f490f10ee5490808e098d6b0026a7d2feacd6794)

Author SHA1 Message Date
zhengyongxing 3855d8d3a9 市场业绩的功能提交 4 years ago
ELF 47ff398bf4 修改 4 years ago
ELF ffad0d78c5 修改 4 years ago
ELF 62d2eaef72 去除商户规则配置删除功能 4 years ago
ELF 3a4fb51222 修改支付商户规则bug 4 years ago
ELF e25f30d13c 修改 4 years ago
ELF dc5e032817 修改 4 years ago
ELF fe55de4aaf 修改 4 years ago
ELF 65c5a221fc 修改 4 years ago
zhengyongxing 32b139a976 比例时间排序 4 years ago
zhengyongxing 9bf3c89659 特殊比例与模板比例添加流水类型 4 years ago
ELF b44a5118cf 修改 4 years ago
万盟天下 f7bd731ead Merge branch 'feature/testing_resource_admin' of wmtx/platform into master
测试资源功能提交
4 years ago
ELF 36c240c608 修改 4 years ago
zhengyongxing 68ba764d72 Merge branch 'hotfix/modify_special_piont' into feature/add_item 4 years ago
zhengyongxing d9b37792fd 特殊补点bug修正 4 years ago
zhengyongxing 6b47baf59a 汇总编辑前端修改 4 years ago
ELF ae3e49b95f 修改 4 years ago
ELF f77505925f 修改 4 years ago
ELF f3771dfd2d 修改 4 years ago
ELF a10bb888da 修改bug 4 years ago
zhengyongxing 4f35cacbab 汇总模板修改提交 4 years ago
ELF 36c4c666ec 修改bug 4 years ago
ELF 18c3e95f30 修改 4 years ago
ELF 8e4ba0e20e 修改 4 years ago
ELF c5fe80639f 修改 4 years ago
ELF 06bd640c79 修改 4 years ago
ELF 263e35c097 初步提交 4 years ago
ELF 36c5b542ee Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/close_334promote_recharge 4 years ago
ELF b7104222a5 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/close_334promote_recharge 4 years ago
ELF f0d79c83a2 修改 4 years ago
廖金灵 662efdb613 Merge branch 'feature/add_item' of wmtx/platform into master
聚合结算单导出bug修正
4 years ago
zhengyongxing 3f90e1d9ee 汇总审批重算状态修正 4 years ago
zhengyongxing 723b3c9fa2 汇总重算提示语修正 4 years ago
zhengyongxing e7b64f27f2 汇总重算提示语修正 4 years ago
郑永星 8d37653db4 Merge branch 'feature/add_item' of wmtx/platform into release
聚合结算单导出公式添加
4 years ago
zhengyongxing ff46e189cc 聚合结算单导出公式添加 4 years ago
郑永星 a8c008923e Merge branch 'feature/add_item' of wmtx/platform into release
汇总导出bug修正
4 years ago
zhengyongxing 053e8acb8f 汇总导出bug修正 4 years ago
郑永星 6cbc8e0102 Merge branch 'feature/add_item' of wmtx/platform into release
聚合汇总导出bug修改
4 years ago
zhengyongxing 1f31244d10 聚合汇总导出bug修改 4 years ago
郑永星 37dd11369e Merge branch 'feature/add_item' of wmtx/platform into release
聚合结算单导出bug修正
4 years ago
zhengyongxing ac5c1a199c 聚合结算单导出bug修正 4 years ago
廖金灵 e916641647 Merge branch 'feature/add_item' of wmtx/platform into master
聚合结算单导出个人与公司导出不相同
4 years ago
郑永星 ac14a6be90 Merge branch 'feature/add_item' of wmtx/platform into release
聚合结算单导出个人与公司导出不相同
4 years ago
zyx 3db4fe1f60 聚合结算单导出个人与公司导出不相同 4 years ago
zyx b92ce713b3 聚合结算单上线 4 years ago
廖金灵 ef9a6d446b Merge branch 'feature/promote_level_sys' of wmtx/platform into master
游戏统计bug
4 years ago
ELF 2b1980bfbd 修改 4 years ago
廖金灵 51e3863b82 Merge branch 'feature/add_item' of wmtx/platform into master
导出公式添加
4 years ago
zhengyongxing f72bb66356 导出公式添加 4 years ago
廖金灵 a2a9625933 Merge branch 'feature/add_item' of wmtx/platform into master
聚合公司汇总公司添加,公司绑定编辑开放
4 years ago
郑永星 cdcfc02614 Merge branch 'feature/add_item' of wmtx/platform into release
公司绑定参数错误修正
4 years ago
zhengyongxing 0d13b05dc0 公司绑定参数错误修正 4 years ago
郑永星 38eb0f4957 Merge branch 'feature/add_item' of wmtx/platform into release
汇总bug修正
4 years ago
zhengyongxing 71826be2cc 汇总bug修正 4 years ago
郑永星 0fd8c71af0 Merge branch 'feature/add_item' of wmtx/platform into release
汇总bug修正
4 years ago
zhengyongxing ba74305974 汇总bug修正 4 years ago
郑永星 ed4297cb71 Merge branch 'feature/add_item' of wmtx/platform into release
汇总bug修正
4 years ago
zhengyongxing c711ef4b92 汇总bug修正 4 years ago
郑永星 d7edb41f44 Merge branch 'feature/add_item' of wmtx/platform into release
汇总bug修正
4 years ago
zhengyongxing 01df95637a 汇总bug修正 4 years ago
郑永星 61d69eab60 Merge branch 'feature/add_item' of wmtx/platform into release 4 years ago
zhengyongxing f1308fce73 汇总bug修正 4 years ago
郑永星 b69bc8ef6a Merge branch 'feature/add_item' of wmtx/platform into release
汇总bug修正
4 years ago
zhengyongxing 3f78880f7d 汇总bug修正 4 years ago
ELF 2ff1fc0041 修改 4 years ago
ELF 55466e44ee 修改 4 years ago
ELF dec6c4b222 修改权限 4 years ago
chenzhi f311da5208 优化银行卡号不限制 4 years ago
zyx f028794473 Merge branches 'feature/add_item' and 'master' of 47.111.118.107:wmtx/platform into feature/add_item
 Conflicts:
	Data/update.sql
4 years ago
zyx a2d68a2752 汇总状态的操作修改 4 years ago
zyx 5bec0ba91c 汇总状态的操作修改 4 years ago
zyx c99cad808c 汇总状态的操作修改 4 years ago
zyx 4a7915ef69 汇总状态的操作修改 4 years ago
zyx d42cd15b0b 汇总状态的操作修改 4 years ago
zyx 041006e1b4 汇总状态的操作修改 4 years ago
zyx 2c5889cd50 汇总状态的操作修改 4 years ago
zyx c692e51fa7 汇总状态的操作修改 4 years ago
zyx 52f4cbacb9 汇总状态的操作修改 4 years ago
zyx 178c86a751 撤销汇总添加退回审核状态 4 years ago
zhengyongxing 56593d5ee8 汇总bug修正 4 years ago
zhengyongxing dc5a65903b 汇总bug修正 4 years ago
ELF e493eedc3f Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/promote_level_sys 4 years ago
zhengyongxing ef0c4427ce Merge branches 'feature/add_item' and 'master' of 47.111.118.107:wmtx/platform into feature/add_item
 Conflicts:
	Data/update.sql
4 years ago
zhengyongxing 4210bb7bf0 汇总bug修正 4 years ago
ELF 8d1a58d583 修改 4 years ago
ELF d33bb3f3f8 修改 4 years ago
zhengyongxing b4bdcd24fc 汇总bug流程修正 4 years ago
ELF 2ae89b9edb 解决冲突 4 years ago
ELF 95248d3582 修改 4 years ago
zhengyongxing e153fb66ca 聚合重新汇总bug修正 4 years ago
万盟天下 9db2434d10 Merge branch 'feature/add_item' of wmtx/platform into master
聚合公司绑定流程优化
4 years ago
zhengyongxing 2b4ed15a30 聚合公司绑定流程优化 4 years ago
ELF 0169d8a2db 修改 4 years ago
郑永星 1eef1ea4c3 Merge branch 'feature/add_item' of wmtx/platform into release
审核拒绝bug修正
4 years ago
郑永星 8b9c732f6a Merge branch 'feature/add_item' of wmtx/platform into master
审核拒绝bug修正
4 years ago
zhengyongxing 7d3c8ebd61 审核拒绝bug修正 4 years ago
万盟天下 1cb13ebb4c Merge branch 'feature/add_item' of wmtx/platform into master
聚合汇总bug修正
4 years ago
zhengyongxing a2b085562d 聚合汇总bug修正 4 years ago
ELF c42a123ad7 修改 4 years ago
ELF 9b11202deb 修改 4 years ago
ELF 28fbbff699 修改 4 years ago
ELF 8d2e61153b 修改 4 years ago
elf@home c4eb04428e 修改 4 years ago
ELF afad195062 修改 4 years ago
ELF fbbc30c874 Merge branch 'master' of 47.111.118.107:wmtx/platform into release 4 years ago
万盟天下 bf1c302803 Merge branch 'hotfix/reset_data_session' of wmtx/platform into release
修改
4 years ago
ELF ca99068a0e 修改 4 years ago
郑永星 4f9c672aa1 Merge branch 'feature/add_item' of wmtx/platform into release
聚合公司绑定修正
4 years ago
zhengyongxing a977cf5f31 聚合公司绑定修正 4 years ago
郑永星 bdcc9a8e27 Merge branch 'hotfix/game_ratio_modify' of wmtx/platform into release
特殊比例bug修正
4 years ago
zhengyongxing 0dd7bceb3f 特殊比例bug修正 4 years ago
ELF 19c782b053 解决冲突 4 years ago
郑永星 2c8c246d31 Merge branch 'feature/add_item' of wmtx/platform into release
汇总权限测试
4 years ago
zhengyongxing 6b486331b5 汇总权限测试 4 years ago
郑永星 66af352eb8 Merge branch 'feature/add_item' of wmtx/platform into release
公司绑定修正
4 years ago
zhengyongxing f4f822d31a 公司绑定修正 4 years ago
郑永星 07e877af4b Merge branch 'feature/add_item' of wmtx/platform into release
绑定公司修正
4 years ago
zhengyongxing f757c10c61 绑定公司修正 4 years ago
郑永星 a825f4757a Merge branch 'feature/add_item' of wmtx/platform into release
小bug修改
4 years ago
zhengyongxing 0ebaf6ed64 小bug修改 4 years ago
郑永星 af65b143bb Merge branch 'feature/add_item' of wmtx/platform into release
押金bug修正
4 years ago
zhengyongxing c06e53ab31 汇总bug修正 4 years ago
郑永星 e593db626c Merge branch 'feature/add_item' of wmtx/platform into release
押金bug修正
4 years ago
zhengyongxing 1e67b1d1a1 汇总bug修正 4 years ago
ELF 2f4868553a 修改 4 years ago
chenzhi 12e8500ce3 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/new_statement_0925 4 years ago
ELF ce1d061ee6 修改 4 years ago
zhengyongxing a1ac92dc02 押金bug修正 4 years ago
ELF 268ea4e34d 修改 4 years ago
zhengyongxing ce0196afea 押金bug修正 4 years ago
zhengyongxing 465f095dc4 市场业绩bug修正 4 years ago
chenzhi 7a8b91c8f0 优化下游同游戏判断 4 years ago
zhengyongxing 5c65f356b2 市场业绩开发类型修正 4 years ago
zhengyongxing 7a021dced5 市场业绩提示语修正 4 years ago
zhengyongxing 15ad0a902b Merge branches 'feature/add_item' and 'release' of 47.111.118.107:wmtx/platform into feature/add_item
 Conflicts:
	Data/update.sql
4 years ago
zhengyongxing dab8251c11 Merge branches 'feature/company_export_change' and 'release' of 47.111.118.107:wmtx/platform into feature/company_export_change
 Conflicts:
	Application/Admin/Controller/AggregateFinanceStatementController.class.php
	Data/update.sql
4 years ago
万盟天下 eca52e2c1f Merge branch 'hotfix/change_game_0927' of wmtx/platform into master
优化删除游戏报错bug
4 years ago
万盟天下 9209c4fe38 Merge branch 'hotfix/change_game_0927' of wmtx/platform into release
优化删除游戏报错bug
4 years ago
ELF 24fe97186e 修改 4 years ago
chenzhi c40e366a03 优化删除游戏报错bug 4 years ago
chenzhi 02aa1bd088 优化1 4 years ago
zhengyongxing c9516b8751 未汇总汇总功能提交 4 years ago
zhengyongxing 4b44356a6d Revert "优化下游个人同游戏判断"
This reverts commit f22dc90e
4 years ago
zhengyongxing bc084fa2e1 汇总编辑小数点保留两位 4 years ago
zhengyongxing a86fab6bf6 聚合公司绑定功能修改 4 years ago
zhengyongxing 984619e310 汇总审批撤回bug修改 4 years ago
zhengyongxing a19f668687 财务汇总功能撤回审批修改 4 years ago
chenzhi f22dc90e96 优化下游个人同游戏判断 4 years ago