6599 Commits (fc567339dbcbce6a61dff3330d7835ad721d4a22)

Author SHA1 Message Date
zhengyongxing 7054f82fde 特殊补点导出修正 4 years ago
zhengyongxing 6e767a739c 市场业绩功能提交 4 years ago
郑永星 5ce0be3fe2 Merge pull request '公会信息登记信息补充' (#87) from feature/add_item into release
公会信息登记信息补充
4 years ago
zhengyongxing 3beeb81063 公会信息登记信息补充 4 years ago
郑永星 fa3943cda4 Merge pull request '公会信息登记信息补充' (#86) from feature/add_item into release
公会信息登记信息补充
4 years ago
zhengyongxing e0430cfb46 公会信息登记信息补充 4 years ago
郑永星 f4ff2c9666 Merge pull request '公会信息登记信息补充' (#85) from feature/add_item into release
公会信息登记信息补充
4 years ago
zhengyongxing f923f4d667 公会信息登记信息补充 4 years ago
陈志 55e29b571c Merge pull request 'feature/more_finance_20201211' (#83) from feature/more_finance_20201211 into release
优化公式
4 years ago
chenzhi 174219d9d5 优化公式 4 years ago
chenzhi 197e129f04 优化结算比例公式 4 years ago
郑永星 9ed794a56c Merge pull request 'feature/add_item' (#82) from feature/add_item into release
公会信息录入功能添加
4 years ago
zhengyongxing e775701c78 公会信息登记导出补充 4 years ago
zhengyongxing 9fceedd10e 模板下载功能添加 4 years ago
zhengyongxing 07ee17ca1d 公会信息录入功能添加 4 years ago
ELF 3dfc92ecc3 修改下载超时 4 years ago
chenzhi 170895055e 优化重算 4 years ago
zhengyongxing 667c43dc5c 市场业绩上月业绩绩效百分比比对 4 years ago
zhengyongxing b073f3e8cd 特殊补点编辑修改 4 years ago
zhengyongxing fecb58efdd 特殊补点编辑修改 4 years ago
chenzhi 6dd2558350 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211 4 years ago
chenzhi 3a629d63ea 优化结算人 4 years ago
tping 32d3160320 Merge branch 'feature/add_item' into hotfix/company_bug 4 years ago
zhengyongxing a641ff2526 上游公司分页修改 4 years ago
tping 8897a87342 甲乙方公司 4 years ago
廖金灵 5c119e2d76 Merge pull request '优化登陆' (#68) from feature/more_finance_20201211 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/68
4 years ago
chenzhi e6e408845b 优化cw只能登陆子系统 4 years ago
chenzhi 8323fafd30 优化只读账号 4 years ago
chenzhi 343ecc8587 优化登陆 4 years ago
廖金灵 54266852cc Merge pull request 'feature/more_finance_20201211' (#67) from feature/more_finance_20201211 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/67
4 years ago
chenzhi 12f4cda850 优化商户筛选 4 years ago
chenzhi 36e9125363 新增测试订单 4 years ago
chenzhi 96c937b7d3 优化日志 4 years ago
chenzhi c85e9a831f 优化消息异步 4 years ago
张谷成 79872bbaf7 Merge pull request '优化' (#64) from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/64
4 years ago
tping 5775e7f02e 优化 4 years ago
chenzhi 14bb68b82e 优化业绩提成 4 years ago
张谷成 83148cd777 Merge pull request '优化' (#63) from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/63
4 years ago
tping 9f329b7c34 优化 4 years ago
chenzhi df2da60986 优化市场部毛利 4 years ago
张谷成 5410a1cb2e Merge pull request '时间格式' (#61) from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/61
4 years ago
tping 98ebb36aa3 时间格式 4 years ago
chenzhi 1b0124606a 优化市场结算脚本 4 years ago
张谷成 049f08af72 Merge pull request '优化' (#59) from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/59
4 years ago
tping e3f020965d 优化 4 years ago
张谷成 5de3b95d54 Merge pull request '优化' (#58) from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/58
4 years ago
tping b4c3b64fb0 优化 4 years ago
张谷成 2123ad9ef4 Merge pull request '优化' (#57) from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/57
4 years ago
tping e57a5f8e50 优化 4 years ago
chenzhi 382f2527a0 优化新增条件 4 years ago
张谷成 a97e94fc21 Merge pull request '1' (#56) from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/56
4 years ago
tping ee34cc86f5 1 4 years ago
郑永星 a6812d26e4 Merge pull request '短信验证万能验证码注释' (#55) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/55
4 years ago
chenzhi c5bc599289 优化游戏统计 4 years ago
zhengyongxing f5e2adb860 短信验证万能验证码注释 4 years ago
chenzhi 813aebfd64 优化统计 4 years ago
郑永星 c62ad6e69d Merge pull request '12.28功能提交' (#54) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/54
4 years ago
zhengyongxing 9c0006ef45 12.28功能提交 4 years ago
郑永星 a9aca61c73 Merge pull request '12.28功能提交' (#53) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/53
4 years ago
zhengyongxing f855835501 12.28功能提交 4 years ago
chenzhi 7ccf5e5857 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211 4 years ago
郑永星 444cff5f64 Merge pull request '12.28功能提交' (#52) from feature/add_item into release
12.28功能提交
4 years ago
zhengyongxing d1b0ec55a8 12.28功能提交 4 years ago
郑永星 1496fa349a Merge pull request '12.28功能提交' (#51) from feature/add_item into release
12.28功能提交
4 years ago
zhengyongxing 0293fd7ff1 12.28功能提交 4 years ago
chenzhi f0829e84cc 优化统计 4 years ago
zhengyongxing bb73235874 12.28功能提交 4 years ago
郑永星 12434fb840 Merge pull request 'feature/add_item' (#50) from feature/add_item into release
12.28功能提交
4 years ago
chenzhi be8a30a2e8 合并 4 years ago
chenzhi b1a34cc9a0 优化不打款汇总 4 years ago
zhengyongxing e84ce56293 12.28功能提交 4 years ago
chenzhi 19f7406298 优化结算 4 years ago
万盟天下 459026d842 Merge pull request '修改bug' (#49) from feature/leniu_testing_resource into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/49
4 years ago
ELF a70bffaee3 修改bug 4 years ago
万盟天下 4917d4806f Merge pull request '调试bug' (#48) from feature/leniu_testing_resource into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/48
4 years ago
ELF 4f4929ad72 修改 4 years ago
万盟天下 9ded6cb0bd Merge pull request '剑仙诀添加资源发放接口' (#47) from feature/leniu_testing_resource into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/47
4 years ago
chenzhi 6aeb73b759 优化财务汇总 4 years ago
ELF 932a082134 剑仙诀添加资源发放接口 4 years ago
chenzhi 90de336434 优化数据 4 years ago
zhengyongxing 08d235c03a 12.28功能提交 4 years ago
zhengyongxing 3c166a913e Merge branch 'feature/update_payment' into feature/add_item
# Conflicts:
#	Application/Admin/Controller/CompanyStatementOfflineController.class.php
#	Application/Admin/Controller/StatementMangementController.class.php
#	Application/Payment/Controller/PaymentController.class.php
#	Application/Payment/View/Payment/lists.html
#	Data/update.sql
4 years ago
chenzhi b6c87bfefe 优化首页 4 years ago
张谷成 1c1ef2e6a9 Merge pull request 'feature/1228zgc' (#46) from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/46
4 years ago
郑永星 cd2d9b3bc2 Merge pull request '12.28功能提交' (#44) from feature/update_payment into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/44
4 years ago
zhengyongxing e0f17ea195 12.28功能提交 4 years ago
chenzhi 0e54b1c376 优化渠道和测试服订单 4 years ago
郑永星 11c7c542f8 Merge pull request '12.28功能提交' (#43) from feature/update_payment into release
12.28功能提交
4 years ago
zhengyongxing d0ee96f7b5 12.28功能提交 4 years ago
郑永星 db487f1033 Merge pull request 'feature/update_payment' (#42) from feature/update_payment into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/42
4 years ago
zhengyongxing ac70fd3f79 12.28功能提交 4 years ago
zhengyongxing f4027b75b3 12.28功能提交 4 years ago
zhengyongxing eb8478fbb7 12.28功能提交 4 years ago
郑永星 21f957f46f Merge pull request '12.28功能提交' (#41) from feature/update_payment into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/41
4 years ago
zhengyongxing 08153a8359 12.28功能提交 4 years ago
郑永星 ad7dc1f46d Merge pull request 'feature/update_payment' (#40) from feature/update_payment into release
12.28功能提交
4 years ago
zhengyongxing ffa78964ec 12.28功能提交 4 years ago
zhengyongxing 29e8421266 12.28功能提交 4 years ago
zhengyongxing 4f2f18ad91 12.28功能提交 4 years ago
zhengyongxing 82592dd457 12.28功能提交 4 years ago
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