6599 Commits (fc567339dbcbce6a61dff3330d7835ad721d4a22)

Author SHA1 Message Date
zhengyongxing c8914800c7 12.28功能提交 4 years ago
zhengyongxing c716535975 12.28功能提交 4 years ago
zhengyongxing 552a6f8181 12.28功能提交 4 years ago
zhengyongxing 6a86a5e76f 12.18功打款能提交 4 years ago
chenzhi 9ab8454970 优化结算汇总 4 years ago
zhengyongxing 8a6191810b 12.18功打款能提交 4 years ago
chenzhi 40005b7177 优化游戏统计 4 years ago
tping ccf0589e4f 导入 4 years ago
chenzhi c0926299dc 优化平台币充值 4 years ago
tping 824b7b3f06 公会信息导入导出 4 years ago
chenzhi fa9dc518d5 导出 4 years ago
chenzhi 4fdb94c617 优化订单查询 4 years ago
chenzhi 45d883e89c 优化渠道统计 4 years ago
zhengyongxing 7c4e0e7521 12.18功能提交 4 years ago
zhengyongxing 8430fa1813 12.18功能提交 4 years ago
chenzhi 19c62de87c 優化公會統計 4 years ago
张谷成 e669d1bc38 Merge pull request '刷新' (#38) from hotfix/1211bug into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/38
4 years ago
tping 6e63176176 刷新 4 years ago
tping 24fcfc4b90 公会信息 4 years ago
张谷成 a7553cf116 Merge pull request '1' (#36) from hotfix/1211bug into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/36
4 years ago
tping 1dbc61a602 1 4 years ago
tping 0f7b23ad57 1 4 years ago
张谷成 0c7e4b2d30 Merge pull request 'hotfix/1211bug' (#35) from hotfix/1211bug into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/35
4 years ago
tping 858e929199 甲乙方公司 4 years ago
tping 304c59be10 甲乙方公司 4 years ago
tping 08df25eab3 展示错误 4 years ago
tping d6f34127df 1 4 years ago
chenzhi 5b5029d570 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211 4 years ago
chenzhi 5f0d0a7101 优化游戏统计导出 4 years ago
chenzhi c5bc21cb36 优化游戏导出 4 years ago
chenzhi f00ef7fcc9 优化导出 4 years ago
chenzhi 236bd8f538 优化财务游戏汇总 4 years ago
chenzhi 76874cf34a 优化游戏统计 4 years ago
张谷成 91701cc612 Merge pull request '公会信息' (#34) from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/34
4 years ago
廖金灵 feb46d1954 Merge pull request 'feature/add_item_two' (#33) from feature/add_item_two into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/33
4 years ago
zhengyongxing 87c6c71d0a 汇总bug修改 4 years ago
zhengyongxing 699449a702 未结算数据的补充 4 years ago
zhengyongxing 0c49d1d655 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/add_item_two 4 years ago
zhengyongxing c30e396b2c 未结算数据的补充 4 years ago
zhengyongxing 32abdbb390 汇总统计修改 4 years ago
chenzhi fc75b7d81d 优化统计 4 years ago
chenzhi 79588d52e8 优化财务汇总 4 years ago
chenzhi 8ef35174dc 优化个人补点 4 years ago
chenzhi ad73fe03b3 优化上游结算 4 years ago
chenzhi 419793d91b 优化上游结算 4 years ago
tping 0aef9e3019 公会信息 4 years ago
chenzhi e6af0fbcd5 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211 4 years ago
chenzhi b7cc3ccd77 优化权限 4 years ago
ELF 9f61cdade9 Merge branch 'master' of 8.136.139.249:wmtx/platform into release 4 years ago
chenzhi 3fdc14120f 优化首页折线 4 years ago
郑永星 9d93f9d56f Merge pull request '未结算数据的补充' (#25) from feature/add_item into release
未结算数据的补充
4 years ago
zhengyongxing 77678249bf 未结算数据的补充 4 years ago
郑永星 bbfc5f64b8 Merge pull request 'feature/add_item' (#24) from feature/add_item into release
未结算数据的补充
4 years ago
zhengyongxing 84efc4d76d 未结算数据的补充 4 years ago
郑永星 6699ce1045 Merge pull request '未结算数据的补充' (#23) from feature/add_item into release
未结算数据的补充
4 years ago
zhengyongxing f13ee0583c 未结算数据的补充 4 years ago
chenzhi d08691c13a 优化充值列表导出 4 years ago
chenzhi 29636f2922 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211 4 years ago
廖金灵 ace44195c5 Merge pull request 'hotfix/and_bug' (#22) from hotfix/and_bug into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/22
4 years ago
chenzhi 78451f0551 消除打印信息 4 years ago
chenzhi 96ead18ff6 优化打印 4 years ago
chenzhi 7abcd38f36 解决推广公司bug 4 years ago
廖金灵 3bedf259a0 Merge pull request 'feature/1211' (#21) from feature/1211 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/21
4 years ago
陈志 7286e3d157 Merge pull request 'hotfix/and_bug' (#20) from hotfix/and_bug into release
优化下游推广公司搜索
4 years ago
chenzhi fb798e82bf 优化下游推广公司搜索 4 years ago
tping e4ef55531a 特殊公司评级管理权限 4 years ago
tping e495105ed0 会长可以看 4 years ago
chenzhi fe75b57618 合并master 4 years ago
廖金灵 72135079fa Merge pull request '数据授权js错误修正' (#16) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/16
4 years ago
zhengyongxing a31e3bf1ab 数据授权js错误修正 4 years ago
chenzhi 0d533525fe 优化权限修改 4 years ago
tping 15c841e883 Merge branch 'release' into feature/1211 4 years ago
tping 553ce102df 特殊公司 4 years ago
郑永星 1f75da3603 Merge pull request '手机万能验证码隐藏' (#13) from feature/add_item into release
手机万能验证码隐藏
4 years ago
zhengyongxing 9736a32013 手机万能验证码隐藏 4 years ago
郑永星 bc162ada96 Merge pull request '手机验证码修改账号' (#12) from feature/add_item into release
手机验证码修改账号
4 years ago
zhengyongxing d47b6a3fad 手机验证码修改账号 4 years ago
廖金灵 342b592976 Merge pull request 'feature/testing_resource_verify_admin' (#11) from feature/testing_resource_verify_admin into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/11
4 years ago
郑永星 48bf17afd3 Merge pull request 'feature/add_item' (#10) from feature/add_item into release
短信登录万能验证码登录开启
4 years ago
zhengyongxing 0d9dd3b22e 短信登录万能验证码登录开启 4 years ago
zhengyongxing 11e64947df 12月功能提交 4 years ago
郑永星 ca8a2ada0e Merge pull request '12月功能提交,手机万能验证码屏蔽提交' (#7) from feature/add_item into release
12月功能提交,手机万能验证码屏蔽提交
4 years ago
zhengyongxing 309b195986 12月功能提交 4 years ago
陈志 79ad02ba2e Merge pull request '优化' (#9) from feature/st_mange_20201202 into release
优化
4 years ago
chenzhi 1945cae9a5 优化 4 years ago
chenzhi 28e93fe832 新增文件 4 years ago
张谷成 6e63a3857e Merge pull request 'feature/1211' (#8) from feature/1211 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/8
4 years ago
tping 0fd16f89d8 Merge branch 'release' into feature/1211 4 years ago
zhengyongxing a0150c300f 12月功能提交 4 years ago
tping cf88d4c1db Merge branch 'release' into feature/1211
# Conflicts:
#	Application/Home/Controller/BaseController.class.php
4 years ago
tping 6c266178df 数据互通 4 years ago
陈志 9d30d48fac Merge pull request 'feature/st_mange_20201202' (#6) from feature/st_mange_20201202 into release
优化公式
4 years ago
chenzhi f4f430cf61 优化公式 4 years ago
zhengyongxing 23e5632eec 12月功能提交 4 years ago
chenzhi a3e0ecb949 优化结算公式 4 years ago
chenzhi 0f82acf447 优化权限修改 4 years ago
zhengyongxing f804b7af3f 12份功能提交 4 years ago
zhengyongxing e74d46bc49 Merge branch 'feature/add_item' of 8.136.139.249:wmtx/platform into feature/add_item 4 years ago
zhengyongxing c0aa5d2dbc 12份功能提交 4 years ago
廖金灵 bdad3f8db9 Merge branch 'release' into feature/add_item 4 years ago
zhengyongxing fb0acddb3f 12份功能提交 4 years ago
chenzhi 753098a85f 优化子站点配置 4 years ago
chenzhi f034698dbc 新增多库 4 years ago
zhengyongxing 21592a67cd 12份功能提交 4 years ago
zhengyongxing 85f523329a 12份功能提交 4 years ago
zhengyongxing b8c811c532 12份功能提交 4 years ago
zhengyongxing 0155dadf8e 12份功能提交 4 years ago
zhengyongxing 68fb680b4c 12份功能提交 4 years ago
zhengyongxing e8203057cd 12份功能提交 4 years ago
zhengyongxing 210da712f9 12份功能提交 4 years ago
zhengyongxing f9488320e9 名称bug修改 4 years ago
zhengyongxing af5aad352a 备注bug修改 4 years ago
tping 481646222f 后台 手机号规则 实名认证修改 4 years ago
tping 5cf8f2ea10 特殊公司 4 years ago
zhengyongxing ec3491943b 12月功能提交 4 years ago
ELF f2be33c427 修改 4 years ago
ELF b73b502a67 修改 4 years ago
zhengyongxing 52ff4a2bc6 12月功能提交 4 years ago
zhengyongxing 9bec07c7d4 不结算bug修改 4 years ago
zhengyongxing 747224dae9 12月功能提交 4 years ago
tping 33ef14e1af 特殊外团 4 years ago
tping e79f18e618 1211 审核列表 甲乙方公司 4 years ago
zhengyongxing 50b5e2cf0e 12月功能提交 4 years ago
zhengyongxing 27ffddfe75 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
# Conflicts:
#	Data/update.sql
4 years ago
zhengyongxing 0e416af776 12月功能提交 4 years ago
zhengyongxing 8bb8e4379f 12月功能提交 4 years ago
zhengyongxing b8af3ea384 12月功能提交 4 years ago
chenzhi 4f1bebc3af 优化游戏统计说明 4 years ago
zhengyongxing 7e41ad1e18 12月功能提交 4 years ago
zyx 6b0de87280 未结算接口修改 4 years ago
chenzhi 2bc72f9ae2 优化个人补点不修改公式 4 years ago
chenzhi 8d1f77537a 优化订单列表新增列 4 years ago
chenzhi a741e8d37d 订单新增设备类型 4 years ago
chenzhi 0b979d9b68 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/st_mange_20201202 4 years ago
chenzhi 24f3489e65 优化导出新增公式 4 years ago
chenzhi 8d156ffb64 新增结算公式 4 years ago
ELF f58e565fe7 修改 4 years ago
zhengyongxing 166c1d63d6 12月功能提交 4 years ago
ELF e5a0117912 修改 4 years ago
tping 31ce7b071c 1211 4 years ago
ELF 1b74318619 修改 4 years ago
zhengyongxing 50958acb3e 12月功能提交 4 years ago
ELF c8f082cee8 优化显示 4 years ago
ELF 78caa452b2 测试资源添加审核人 4 years ago
ELF 88402dfac0 修改 4 years ago
zhengyongxing 16f514d084 12月功能提交 4 years ago
廖金灵 9483e4b7b3 Merge branch 'feature/add_item' of wmtx/platform into master
编辑页面调整,及多个编辑错误修正
4 years ago
zhengyongxing 7c5c67a87c 编辑页面调整,及多个编辑错误修正 4 years ago
zhengyongxing 2758c608ad 编辑扣款旧的验证添加 4 years ago
ELF cf42967f4f Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check 4 years ago
ELF b28e00b9f2 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check 4 years ago
chenzhi d06cc0ea10 优化去除同公司奖罚 4 years ago
chenzhi 3053461ee5 优化奖罚排序 4 years ago
廖金灵 401ad97cbc Merge branch 'feature/add_item' of wmtx/platform into master
编辑扣款旧的验证添加
4 years ago
zhengyongxing bb0d37bb53 编辑扣款旧的验证添加 4 years ago
zhengyongxing 10ddadece7 js字符类型修改成数字类型 4 years ago
廖金灵 5b096ad2ff Merge branch 'feature/add_item' of wmtx/platform into master
11月bug修复
4 years ago
zhengyongxing 923851fea7 11月bug修复 4 years ago
廖金灵 470bcdfebf Merge branch 'feature/add_item' of wmtx/platform into master
11月bug修复
4 years ago
chenzhi 943d63faac 优化财务汇总 4 years ago
zhengyongxing 564a2ec91d 11月bug修复 4 years ago
郑永星 3f7c20c3ab Merge branch 'feature/add_item' of wmtx/platform into release
11月bug修复
4 years ago
zhengyongxing 0e67e37436 11月bug修复 4 years ago
郑永星 e179d507e8 Merge branch 'feature/add_item' of wmtx/platform into release
11月bug修复
4 years ago
zhengyongxing 0572fde5ad 11bug修复 4 years ago
陈志 dffb70f798 Merge branch 'feature/game_change_statement_20201125' of wmtx/platform into release
优化是否参与结算导出
4 years ago
廖金灵 3e27f09e7d Merge branch 'feature/add_item' of wmtx/platform into master
特殊补点用户名修正
4 years ago
chenzhi a20285a42e 优化是否参与结算导出 4 years ago
zhengyongxing 08dd238ca4 特殊补点用户名修正 4 years ago
chenzhi e7cd32b2a2 优化是否结算参数 4 years ago
廖金灵 bfbac3b30a Merge branch 'feature/add_item' of wmtx/platform into master
汇总刷新接口提交
4 years ago
廖金灵 1b3a365409 Merge branch 'hotfix/promote_group_view_recharge' of wmtx/platform into release
雷雨等导量公会组长可以看到充值信息
4 years ago
zhengyongxing ef13761820 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item_others 4 years ago
ELF d43d0c2628 雷雨等导量公会组长可以看到充值信息 4 years ago
zhengyongxing d6b8fa208c 汇总刷新接口提交 4 years ago
zhengyongxing baca13a95e 换行字数修正 4 years ago
ELF 1bb1b284e6 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check 4 years ago
chenzhi 2890f3e820 优化订单查看 4 years ago
chenzhi 147cac3a9e 优化公会统计 4 years ago
chenzhi b9b497e255 优化公会结算 4 years ago
chenzhi 9ddfb6f794 现在参与结算筛选 4 years ago
chenzhi 9803de1edb Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/game_change_statement_20201125 4 years ago
chenzhi 2d0bba8de5 优化修改推广游戏操作日志 4 years ago
chenzhi 7e1d2fb879 优化日志 4 years ago
chenzhi 5644570c1e 新增日志 4 years ago
陈志 4da7fa623f Merge branch 'feature/add_item' of wmtx/platform into release
优化新增仅单参与结算是结算
4 years ago
chenzhi 5e9723b040 优化新增仅单参与结算是结算 4 years ago
chenzhi 74d9d6ed18 优化充值操作 4 years ago
郑永星 9a008d2bfc Merge branch 'feature/add_item' of wmtx/platform into release
换行字数修正
4 years ago
zhengyongxing b54b37e99c 换行字数修正 4 years ago
郑永星 4262b55a66 Merge branch 'feature/add_item' of wmtx/platform into release
市场业绩bug修正
4 years ago
zhengyongxing 59ec6c28ca 市场业绩bug修正 4 years ago
陈志 ff23d13c54 Merge branch 'feature/game_select_bug' of wmtx/platform into release 4 years ago
chenzhi 73f8c16379 游戏统计修改bug 4 years ago
郑永星 89909c10fd Merge branch 'feature/add_item' of wmtx/platform into release
小数点保留
4 years ago
zhengyongxing ed8d1fee0a 小数点保留 4 years ago
郑永星 d090b707dc Merge branch 'feature/add_item' of wmtx/platform into release
小数点保留两位添加
4 years ago
zhengyongxing b54b2660d4 小数点保留两位添加 4 years ago
郑永星 a866fd6b8d Merge branch 'feature/add_item' of wmtx/platform into release
保留两位小数判断
4 years ago
zhengyongxing 711992a287 保留两位小数判断 4 years ago
chenzhi eeb1821859 暂存 4 years ago
郑永星 9b36a1c6bc Merge branch 'feature/add_item' of wmtx/platform into release
保留两位小数
4 years ago
zhengyongxing c829c56956 保留两位小数 4 years ago
郑永星 66902a13ec Merge branch 'feature/add_item' of wmtx/platform into release
内团去除比例结束时间减1
4 years ago
zhengyongxing 1717c2958b 最大值判断添加 4 years ago
zhengyongxing 4dd097667f 内团去除比例结束时间减1 4 years ago
郑永星 37d1419bb9 Merge branch 'feature/add_item' of wmtx/platform into release
最大值判断添加
4 years ago
zhengyongxing ff21751d31 最大值判断添加 4 years ago
万盟天下 8482cd9382 Merge branch 'feature/elf_version_1117' of wmtx/platform into release
修改游戏统计bug
4 years ago
ELF e46cc5b52e 修改bug 4 years ago
zhengyongxing 640cb01bbb 12月功能提交 4 years ago
tping 43c62c05d7 Merge branch 'release' into feature/zgc_1126
# Conflicts:
#	Application/Admin/View/PromoteCompany/add.html
#	Application/Admin/View/PromoteCompany/edit.html
4 years ago
万盟天下 4557b3dc2f Merge branch 'feature/elf_version_1117' of wmtx/platform into release
修改游戏统计bug
4 years ago
ELF 47fcab323b 修改游戏统计bug 4 years ago
万盟天下 41ab9703a9 Merge branch 'feature/add_item' of wmtx/platform into release
11月功能提交
4 years ago
万盟天下 82cf73ede5 Merge branch 'feature/elf_version_1117' of wmtx/platform into release
游戏统计/后台登录时间修改
4 years ago
zhengyongxing b32f5efd91 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_item_others
 Conflicts:
	Data/update.sql
4 years ago
zhengyongxing 46f33b3d05 12月功能提交 4 years ago
chenzhi 9da9941c9f 优化支付数据查看 4 years ago
zhengyongxing 3d1ab70123 11月功能提交 4 years ago
ELF f95125892a 优化推广员后台汇总查询 4 years ago
zhengyongxing 5c27c63835 11月功能提交 4 years ago
廖金灵 5c23366b73 Merge branch 'feature/promote_tg_dm' of wmtx/platform into master
根据推广公司配置推广后台
4 years ago
ELF 7468057834 推广员结算订单归属 4 years ago
zhengyongxing 9b87b9c4a1 11月功能提交 4 years ago
zhengyongxing 41e9820d83 11月功能提交 4 years ago
zhengyongxing e138517136 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item 4 years ago
zhengyongxing 710439d8df 11月功能提交 4 years ago
ELF 289783eecd 修改 4 years ago
tping dd786dc27f 1126 批量上下架 4 years ago
tping b722175785 1126 权限 4 years ago
chenzhi 986065ab4b 优化名词 4 years ago
tping 033cd00aee 1126 4 years ago
zhengyongxing c749df4936 11月功能提交 4 years ago
tping d8924dc8be 1126 客服qq 4 years ago
zhengyongxing 36d40bc24e 11月功能提交 4 years ago
zhengyongxing 5add29fa6b 11月功能提交 4 years ago
zhengyongxing 8bce1bd12c Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item 4 years ago
zhengyongxing 2040991894 11月功能提交 4 years ago
ELF a0f57749c4 优化当前域名获取 4 years ago
ELF ef8334dd18 添加域名前缀限制 4 years ago
chenzhi e7501be7c3 优化审核流程 4 years ago
tping ff4975bacb 1126 4 years ago
zhengyongxing f3a45dfac6 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item 4 years ago
zhengyongxing a6263b2205 11月功能提交 4 years ago
tping 3471639489 支付通知 补单 4 years ago
tping 103acdd15d 支付通知 小数点后面.00 4 years ago
chenzhi 5bdc0e6f6e 优化汇总方案 4 years ago
tping 0d52dc7d61 1126 4 years ago
chenzhi 55dd67e34d 优化撤回 4 years ago
chenzhi 56681580dd 合并 4 years ago
chenzhi 6d4fce53eb 优化线下打款 4 years ago
chenzhi bd125be3dd 优化汇总审核流程 4 years ago
ELF c339623c78 优化 4 years ago
elf@home dd66846e68 根据推广公司配置推广后台 4 years ago
zhengyongxing 1626640066 11月功能提交 4 years ago
ELF 773068b57c 优化代码 4 years ago
zhengyongxing 4eff2f0aaa 11月功能提交 4 years ago
zhengyongxing d6b1916a5d 11月功能提交 4 years ago
ELF dd7068e3ae 改用redis存储session 4 years ago
tping 025d90f5fa 1126 4 years ago
chenzhi ad1d4e65a5 优化游戏汇总 4 years ago
chenzhi bea27fd5de 优化游戏汇总 4 years ago
tping c75d73c9f7 1126 4 years ago
ELF 6a50654045 游戏统计/后台登录时间修改 4 years ago
chenzhi 7f9bb248dd 优化推广员统计 4 years ago
chenzhi 1f694ef47b 优化推广员充值 4 years ago
chenzhi e896f5e649 Merge branch 'master' of 47.111.118.107:wmtx/platform into fix/company_20201111 4 years ago
chenzhi a6f9d82245 优化推广员累计注册 4 years ago
chenzhi 7a876e01ab 优化新增推广员汇总 4 years ago
zhengyongxing f49cd75e86 11月功能提交 4 years ago
zhengyongxing 6811eb806c Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/add_item
 Conflicts:
	Application/Admin/Controller/CompanyStatementPoolController.class.php
	Application/Admin/Controller/CompanyStatementSetController.class.php
	Data/update.sql
4 years ago
廖金灵 da2dc09690 Merge branch 'new_change' of wmtx/platform into master
汇总bug修改
4 years ago
zhengyongxing e098384635 汇总bug修改 4 years ago
zhengyongxing 3656c555d1 11月功能提交 4 years ago
chenzhi ffd8c92940 优化奖罚 4 years ago
ELF 89332c0d54 解决冲突 4 years ago
ELF eef296ea08 发放资源自动审核/发放优化 4 years ago
ELF b92f564a49 发放资源自动审核/发放优化 4 years ago
ELF c550846454 修改 4 years ago
zhengyongxing 4526b5b741 11月功能提交 4 years ago
ELF 977cfcba3c 修改 4 years ago
ELF c20d071817 修改 4 years ago
ELF 40123f8c50 修改 4 years ago
ELF 530dded4e7 优化 4 years ago
ELF ceadb8562f 新增60/90日留存率统计 4 years ago
ELF 5253a76963 优化 4 years ago
ELF 3a6b912399 优化 4 years ago
ELF afc95791d2 优化 4 years ago
chenzhi d0a61d3e87 游戏充值导出新增cp列 4 years ago
ELF d0b2e5f459 优化 4 years ago
ELF 1f3eaa06da 修改 4 years ago
ELF 07f7bca3ee 修改 4 years ago
ELF 47ca2f2b9e 修改 4 years ago
ELF e1352fea1e 修改 4 years ago
chenzhi cdd1cd7d7f 优化页面页数 4 years ago
ELF dd71ccdf83 修改 4 years ago
廖金灵 648cde1eff Merge branch 'hotfix/perm_market_visiable' of wmtx/platform into release
推广员信息显示通过权限控制
4 years ago
ELF 53f3ad6864 优化 4 years ago
廖金灵 38dc6c0c56 Merge branch 'hotfix/perm_market_visiable' of wmtx/platform into release
市场专员信息显示通过权限控制
4 years ago
ELF dfdc31f4dc 市场专员信息显示通过权限控制 4 years ago
zhengyongxing 6021f91604 公会订单添加所属商户 4 years ago
zhengyongxing 3f04fa1507 公会统计商户名称修改 4 years ago
zhengyongxing deee3228dd 公会统计商户导出 4 years ago
zhengyongxing 58ff5ad1ed 公会统计--订单详情 新增所属商户展示 4 years ago
ELF f490f10ee5 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/testing_resource_admin 4 years ago
zhengyongxing 767ce5734d 市场业绩重算只重算上个月提交 4 years ago
zhengyongxing a3b86e9339 市场业绩提成修正 4 years ago
zhengyongxing d85ac9066d 市场业绩bug修改 4 years ago
zhengyongxing 6c005f01f6 市场业绩比例永久判断bug修改 4 years ago
廖金灵 f7eb64f6ba Merge branch 'feature/add_item_other' of wmtx/platform into master
外团特殊比例自动审核通过
4 years ago
zhengyongxing 48f4fef494 外团特殊比例自动审核通过 4 years ago
zhengyongxing 02635cc6e9 外团特殊比例自动审核通过 4 years ago
zhengyongxing 324deba9c2 外团特殊比例功能提交 4 years ago
zhengyongxing 24f3cbc99e 外团特殊比例功能提交 4 years ago
郑永星 e28e7c347e Merge branch 'feature/add_item_other' of wmtx/platform into release
内团特殊比例自动审核通过
4 years ago
zhengyongxing cf21a4f324 外团特殊比例自动审核通过 4 years ago
zhengyongxing 6efa26ecfd 外团特殊比例自动审核通过 4 years ago
廖金灵 3099b175c8 Merge branch 'hotfix/orderquery' of wmtx/platform into master
增加清除时间
4 years ago
郑永星 bf4e31d73d Merge branch 'feature/add_item_other' of wmtx/platform into release
特殊比例申请比例限制提交
4 years ago
zhengyongxing d73602d30b Merge branch 'feature/add_item_other' of 47.111.118.107:wmtx/platform into feature/add_item_other 4 years ago
zhengyongxing 0155111706 特殊比例申请比例限制提交 4 years ago
chenzhi 3db0914108 优化导出公司 4 years ago
zhengyongxing b3658dfaa9 比例方法提交 4 years ago
张谷诚 f23f456ddc Merge branch 'hotfix/orderquery' of wmtx/platform into release
增加清除时间
4 years ago
tping 5a57d87ff7 增加清空时间 4 years ago
chenzhi 833619518b 优化测试 4 years ago
chenzhi 9002ae24be 优化重算 4 years ago
陈志 24bbce9d66 Merge branch 'feature/add_item' of wmtx/platform into release
优化上游
4 years ago
chenzhi d029e4562d 优化上游 4 years ago
廖金灵 a3ce776d16 Merge branch 'feature/version_1028' of wmtx/platform into release
优化代码
4 years ago
陈志 e12add2432 Merge branch 'feature/add_item' of wmtx/platform into release
优化上游pool
4 years ago
chenzhi 6f90b18be9 优化上游pool 4 years ago
ELF 2dc69ac892 修改 4 years ago
廖金灵 710573f511 Merge branch 'feature/version_1028' of wmtx/platform into release
修改数据汇总bug
4 years ago
ELF 75754a8957 修改 4 years ago
张谷诚 fc666fa7b1 Merge branch 'hotfix/orderquery' of wmtx/platform into release
导出支付显示问题
4 years ago
tping 1c6a17d50f 支付方式显示 4 years ago
张谷诚 f25bc96071 Merge branch 'hotfix/orderquery' of wmtx/platform into release
到账时间导出
4 years ago
tping adb011ca5a 到账时间 4 years ago
郑永星 2496f1f64b Merge branch 'feature/add_item_other' of wmtx/platform into release
内团推广游戏提示语修改
4 years ago
zhengyongxing 178f89f43b 内团推广游戏提示语修改 4 years ago
张谷诚 0c9033e700 Merge branch 'hotfix/orderquery' of wmtx/platform into release
到账时间导出
4 years ago
tping e86f4c4762 到账时间 4 years ago
郑永星 a9f96722b1 Merge branch 'feature/add_item_other' of wmtx/platform into release
外团推广功能提交
4 years ago
zhengyongxing 25e710c27e 外团推广功能提交 4 years ago
张谷诚 b642f671c7 Merge branch 'hotfix/orderquery' of wmtx/platform into release 4 years ago
tping e6ae117fd7 1,隐藏删除按钮(后台->推广->游戏分包)
2,推广后台增加下单时间查询
4 years ago
zhengyongxing 0f44573fe2 市场业绩提交 4 years ago
zhengyongxing bb5547fb6f Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_item_other
 Conflicts:
	Data/update.sql
4 years ago
zhengyongxing ce3aa147e5 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item 4 years ago
zhengyongxing ccf27d77a1 市场业绩删除修正 4 years ago
chenzhi 9083471980 优化补点 4 years ago
zhengyongxing 295f86e588 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item 4 years ago
zhengyongxing 7463222308 外团推广功能提交 4 years ago
chenzhi 3f6472e64c 优化下游个人补点 4 years ago
zhengyongxing e33b19d4b0 外团推广功能提交 4 years ago
zhengyongxing 4e8cb8dfe1 外团推广功能提交 4 years ago
zhengyongxing f569747948 外团推广功能提交 4 years ago
zhengyongxing f38b9026b5 外团推广功能提交 4 years ago
zhengyongxing f6f9437ed0 外团推广功能提交 4 years ago
zhengyongxing b0b893e51d Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item 4 years ago
zhengyongxing 80b148d6c5 外团推广功能提交 4 years ago
廖金灵 9c6f1b6789 Merge branch 'feature/version_1028' of wmtx/platform into release
修改bug
4 years ago
ELF be9075fc63 修改bug 4 years ago
chenzhi 6ce7377dc1 优化补点 4 years ago
zhengyongxing 859f5b58c9 汇总功能还原修正 4 years ago
zhengyongxing f450df3265 汇总功能修正 4 years ago
zhengyongxing 54a0fde480 汇总公司与上游回退 4 years ago
zhengyongxing 233fa89251 外团推广功能提交 4 years ago
zhengyongxing 38fb5398d1 外团推广功能提交 4 years ago
zhengyongxing 27c95792ff 外团推广功能提交 4 years ago
zhengyongxing def69bf6aa 外团推广功能修正提交 4 years ago
zhengyongxing 0af52ad4ea 汇总金额为空时添加数据 4 years ago
zhengyongxing befa97e04d Merge branch 'feature/add_item' of 47.111.118.107:wmtx/platform into feature/add_item 4 years ago
chenzhi 96b296a4b6 优化比例为空 4 years ago
zhengyongxing 8340ddc115 外团推广功能提交 4 years ago
zhengyongxing c27315d3c0 外团推广功能提交 4 years ago
chenzhi ded1da96f9 Merge branch 'feature/add_item' of 47.111.118.107:wmtx/platform into feature/add_item 4 years ago
chenzhi 7ade60fb02 优化比例获取 4 years ago
zhengyongxing a5c7c224aa 比例功能提交 4 years ago
zhengyongxing 823e241f2e 外团推广功能bug修正 4 years ago
廖金灵 001b390afc Merge branch 'feature/version_1028' of wmtx/platform into release
修改评级等功能
4 years ago
ELF 34586b228e 修改 4 years ago
ELF 8c8d01a446 修改评级 4 years ago
zhengyongxing 97c33c8e1b 游戏比例公用方法修正 4 years ago
zhengyongxing 34b12ad382 定时器功能提交 4 years ago
zhengyongxing 5c497b94dc 分成比例导出修正 4 years ago
ELF 092683425d 修改 4 years ago
zhengyongxing 2dbb4a7940 市场部提示语修改 4 years ago
zhengyongxing c1b556b0b1 市场业绩排序修改 4 years ago
chenzhi 10d13472ec 紧急修复外团选择游戏 4 years ago
zhengyongxing 6ac5c1d524 比例逻辑修改 4 years ago
zhengyongxing 0c69c8f662 汇总结算结算时间位置修改 4 years ago
zhengyongxing 40664b5f8d 市场业绩功能修改,将不结算毛利以日来统计 4 years ago
zhengyongxing ba6323203a 模板比例bug修改提交 4 years ago
zhengyongxing 2848f0ce90 外团推广游戏功能高亮显示 4 years ago
zhengyongxing 2914f9964c 汇总编辑结算金额总计添加 4 years ago
ELF 3c11826a1c 修改 4 years ago
zhengyongxing aa852a9a7f 外团推广功能金额修改 4 years ago
zhengyongxing f0cbe3cafb 周结算金额bug修改 4 years ago
elf@home f13f3f7744 修改 4 years ago
ELF 3f92608468 推广后台功能开发 4 years ago
zhengyongxing 86769746ef 外团可申请游戏bug修改 4 years ago
zhengyongxing e30cd2fea7 外团推广功能提交 4 years ago
zhengyongxing 5c57abc794 历史流水比例修正 4 years ago
zhengyongxing f8a7d53ac8 外团推广功能提交 4 years ago
zhengyongxing a00834e4e5 外团推广功能不结算提交 4 years ago
zhengyongxing 9c49d8bedc 外团推广功能提交 4 years ago
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