6694 Commits (10753da02cd60e3f0a59afe770627951f7618397)

Author SHA1 Message Date
chenzhi ce90ddf3ad 优化推广员统计 4 years ago
廖金灵 8e571e0808 Merge pull request 'feature/finance_payment_20210115' (#219) from feature/finance_payment_20210115 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/219
4 years ago
chenzhi c91206c176 优化推广员统计 4 years ago
chenzhi 7c460cdb47 优化支付导出 4 years ago
陈志 b4277c2276 Merge pull request '优化订单换绑到江息' (#217) from feature/finance_payment_20210115 into release
优化订单换绑到江息
4 years ago
chenzhi c2303a0676 优化订单换绑到江息 4 years ago
郑永星 c754037b79 Merge pull request '财务子系统bug修改' (#216) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/216
4 years ago
zhengyongxing 2f9a822583 财务子系统bug修改 4 years ago
chenzhi 4f14228bab 优化子站列表 4 years ago
chenzhi a03993f251 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 4 years ago
liyang 8617ad3e91 Merge branch 'release' of http://8.136.139.249:3000/wmtx/platform into feature/LY0309 4 years ago
chenzhi 1b7dae2603 优化结算同步 4 years ago
chenzhi c21b9f619e 新增子站结算 4 years ago
zhengyongxing 0332b591e8 3.22功能提交 4 years ago
chenzhi 8d871290f2 优化默认公司 4 years ago
zhengyongxing eb8c9cebc1 3.22好功能提交 4 years ago
chenzhi 50363297e8 优化订单数据换绑 4 years ago
chenzhi f670c7196a 优化提示 4 years ago
chenzhi 6790ab5fd3 新增订单重算及固化 4 years ago
chenzhi 1de381bccd 优化是否结算 4 years ago
chenzhi bb10181cc5 新增子站游戏订单及导出 4 years ago
chenzhi 8b98460242 新增备注 4 years ago
chenzhi 17cee767b7 子站同步脚本 4 years ago
liyang f8b93616ce 菜单封装中 4 years ago
chenzhi 59d1e31119 优化退款可以负数 4 years ago
chenzhi 7ed2855dc5 优化重算 4 years ago
chenzhi e7a51c41da 优化前端入口文件 4 years ago
chenzhi 5f3c726a05 优化游戏统计合计 4 years ago
chenzhi 243dce02ca 优化聚合万盟数据 4 years ago
chenzhi aa99f1f668 新增审核撤回 4 years ago
chenzhi 88d02f7be1 优化导出提醒-zyx 4 years ago
廖金灵 a429003fa9 Merge pull request '财务子系统bug修复' (#198) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/198
4 years ago
zhengyongxing 3900a4081a 财务子系统bug修复 4 years ago
zhengyongxing ae3ad391fd 新功能开发 4 years ago
廖金灵 96c6a47dd5 Merge pull request '热更修复' (#197) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/197
4 years ago
zhengyongxing a84a69fd56 热更修复 4 years ago
郑永星 3eb6fbad4d Merge pull request 'feature/add_item' (#196) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/196
4 years ago
ELF 1ab1db12ab 修复苹果落地页无法滚动bug 4 years ago
廖金灵 e9507ddb95 Merge pull request '热更修复汇总上游时间错误' (#194) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/194
4 years ago
zhengyongxing 55c75e159c 热更修复 4 years ago
廖金灵 df747704ba Merge pull request '2.28号功能提交' (#193) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/193
4 years ago
zhengyongxing 55ffc36a10 2.28号功能提交 4 years ago
廖金灵 bd20d4a770 Merge pull request '2.28号功能提交' (#192) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/192
4 years ago
zhengyongxing 4aa569d092 2.28号功能提交 4 years ago
陈志 f328397807 Merge pull request 'feature/finance_payment_20210115' (#190) from feature/finance_payment_20210115 into release
优化连接
4 years ago
chenzhi 75850db849 优化测试 4 years ago
chenzhi 0a0ee66012 优化连接 4 years ago
chenzhi cc59050261 优化权限添加 4 years ago
陈志 a26b10ab2c Merge pull request 'feature/finance_payment_20210115' (#188) from feature/finance_payment_20210115 into release
优化上游
4 years ago
chenzhi a33ea0d575 优化上游 4 years ago
chenzhi e8dea24f46 新增周结 4 years ago
陈志 a85ae5125c Merge pull request '优化子站平台币充值区分万盟' (#187) from feature/finance_payment_20210115 into release
优化子站平台币充值区分万盟
4 years ago
chenzhi 55572ce862 优化子站平台币充值区分万盟 4 years ago
郑永星 0c465ef26d Merge pull request '2.28号功能提交' (#186) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/186
4 years ago
zhengyongxing 886bbfcfc2 2.28号功能提交 4 years ago
郑永星 1b86292c4e Merge pull request '2.28号功能提交' (#185) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/185
4 years ago
zhengyongxing 73beadd929 2.28号功能提交 4 years ago
郑永星 d73e2bae02 Merge pull request '2.28号功能提交' (#184) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/184
4 years ago
zhengyongxing bc3f4f02d3 2.28号功能提交 4 years ago
郑永星 727873e25c Merge pull request 'feature/add_item' (#183) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/183
4 years ago
zhengyongxing 1ec35eeb32 2.28号功能提交 4 years ago
chenzhi 7756efe859 优化结算单显示 4 years ago
zhengyongxing 2af6231106 2.28号功能提交 4 years ago
zhengyongxing 5556bbf171 2.28号功能提交 4 years ago
zhengyongxing 9837ba3682 2.28号功能提交 4 years ago
zhengyongxing 0be51f4d62 2.28号功能提交 4 years ago
郑永星 0f39caaf60 Merge pull request 'feature/add_item' (#177) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/177
4 years ago
zhengyongxing c6587b61a5 2.28号功能提交 4 years ago
zhengyongxing 8e28b1c4ad 2.28号功能提交 4 years ago
郑永星 dfdcedea38 Merge pull request '2.28号功能提交' (#176) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/176
4 years ago
chenzhi 12f84844c4 新增权限审核 4 years ago
zhengyongxing 016c2e11bd 2.28号功能提交 4 years ago
chenzhi a889417f5a Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 4 years ago
chenzhi 0b4e9fa9a1 优化重算 4 years ago
郑永星 23147ac0cc Merge pull request '2.28号功能提交' (#173) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/173
4 years ago
zhengyongxing 4425750972 2.28号功能提交 4 years ago
chenzhi 3263c108c3 新增个人结算 4 years ago
chenzhi c285a88c8d 优化子站生成数据 4 years ago
chenzhi 7d650a9595 子站内团脚本 4 years ago
chenzhi a439946207 优化子站启动脚本 4 years ago
chenzhi 4024e45c64 优化子站上游结算 4 years ago
chenzhi e6e8e1d0b3 暂存 4 years ago
chenzhi b75bcdbb1c 新增上游导出查看 4 years ago
郑永星 b7a120c56a Merge pull request '2.10号功能提交' (#172) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/172
4 years ago
zhengyongxing c2bfcd39b6 2.10号功能提交 4 years ago
郑永星 f078bfd8b6 Merge pull request '2.10号功能提交' (#171) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/171
4 years ago
zhengyongxing 4419f1539c 2.10号功能提交 4 years ago
郑永星 3c760984ab Merge pull request '2.10号功能提交' (#170) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/170
4 years ago
zhengyongxing 9b2f7b1a61 2.10号功能提交 4 years ago
陈志 6d60674031 Merge pull request '优化永星bug' (#168) from feature/finance_payment_20210115 into release
优化永星bug
4 years ago
chenzhi 098ba97d3e 优化永星bug 4 years ago
廖金灵 36becfb8d6 Merge pull request '1' (#166) from feature/0207zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/166
4 years ago
廖金灵 81ac1baaf1 Merge pull request '额外额度计算修改' (#167) from feature/TestingResource-0205 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/167
4 years ago
liyang 65ca417a2e 推广后台资源申请页面 4 years ago
liyang e008e14046 额外额度计算修改 4 years ago
tping fb3bcdd107 1 4 years ago
廖金灵 e84f8c174a Merge pull request '优化' (#165) from feature/testing_quota_up into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/165
4 years ago
ELF 8a815af691 优化 4 years ago
ly 4a69622b01 额外额度备注信息显示 4 years ago
chenzhi c936ee528c 优化取消时间导出错误 4 years ago
liyang 769a6974ab 额外额度、申请批次修改 4 years ago
郑永星 84d6d1c145 Merge pull request '2.7号功能提交' (#161) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/161
4 years ago
zhengyongxing 6dce14520e 2.7号功能提交 4 years ago
郑永星 2a3446b56c Merge pull request '2.7号功能提交' (#159) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/159
4 years ago
zhengyongxing 92d6f504e8 2.7号功能提交 4 years ago
郑永星 4e6e402f71 Merge pull request '2.7号功能提交' (#158) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/158
4 years ago
zhengyongxing 347facea89 2.7号功能提交 4 years ago
郑永星 bf2851b11d Merge pull request '2.7号功能提交' (#157) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/157
4 years ago
zhengyongxing fec3c76ac1 2.7号功能提交 4 years ago
郑永星 b060f3302d Merge pull request '2.7号功能提交' (#156) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/156
4 years ago
zhengyongxing b2231ff63b 2.7号功能提交 4 years ago
chenzhi 3997bc4b17 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 4 years ago
chenzhi 2f90e19f1f 移除个人导出打款状态 4 years ago
chenzhi b592554501 Merge branch 'feature/testing_daily_count' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 4 years ago
陈志 9b3b982df7 Merge pull request '优化所属会长判断' (#154) from feature/testing_daily_count into release
优化所属会长判断
4 years ago
chenzhi d7a787c0fc 优化所属会长判断 4 years ago
郑永星 12eb8aa9f0 Merge pull request '2.7号功能提交' (#153) from feature/add_item into release
2.7号功能提交
4 years ago
zhengyongxing 53ba2c7698 2.7号功能提交 4 years ago
陈志 a28c71ecb8 Merge pull request 'feature/testing_daily_count' (#152) from feature/testing_daily_count into release
优化测试统计导出
4 years ago
chenzhi 290b48dc3b 优化测试统计导出 4 years ago
chenzhi 4e5f6a664d 更新bug 4 years ago
陈志 a9e53ea354 Merge pull request '新增线上线下结算统计' (#150) from feature/finance_payment_20210115 into release
新增线上线下结算统计
4 years ago
张谷成 76f6c77160 Merge pull request '1' (#148) from hotfix/0203 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/148
4 years ago
tping f3efd97a19 1 4 years ago
tping 792508bd64 1 4 years ago
tping e5b6af3771 1 4 years ago
chenzhi e2882cc5aa 新增线上线下结算统计 4 years ago
tping d14cb334af Merge branch 'release' into feature/0207zgc 4 years ago
tping fbf0b27ca3 推广后台充值导出 4 years ago
chenzhi 9cfe8abe68 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 4 years ago
chenzhi 4a80ee2f87 优化公会统计说明 4 years ago
廖金灵 9fdfeb7586 Merge pull request '测试资源修改' (#144) from feature/testing_resource_permission into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/144
4 years ago
chenzhi 35c25119e4 优化管理后台线下打款合计字段 4 years ago
chenzhi fa514335cd 统一打款系统统计 4 years ago
chenzhi 0c54e6ecb7 新增汇总单号查找 4 years ago
chenzhi 926b8975f1 修改名词 4 years ago
chenzhi a10174b3e6 优化打款系统登陆 4 years ago
chenzhi 8b4814cbf5 优化结算审核 4 years ago
ELF 2ecaa742d5 优化 4 years ago
ELF a355c2b579 优化 4 years ago
廖金灵 b6412dd9c7 Merge pull request '市场业绩脚本修正' (#138) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/138
4 years ago
zhengyongxing 3e363d65d5 市场业绩脚本修正 4 years ago
廖金灵 49bc231e92 Merge pull request '工会统计bug修改' (#135) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/135
4 years ago
zhengyongxing 735823d792 工会统计bug修改 4 years ago
elf@home 23643d2e0b 修改 4 years ago
廖金灵 ea21c1ee49 Merge pull request '修改i哎' (#133) from feature/add_promote_level_id into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/133
4 years ago
ELF 874ba3a705 修改i哎 4 years ago
廖金灵 a217127548 Merge pull request '优化' (#132) from feature/add_promote_level_id into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/132
4 years ago
ELF 91996da3a2 优化 4 years ago
郑永星 42550a32fb Merge pull request '1.28功能提交' (#131) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/131
4 years ago
zhengyongxing 199b5e0f51 1.28功能提交 4 years ago
郑永星 5c5fc23210 Merge pull request '1.28功能提交' (#130) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/130
4 years ago
zhengyongxing cd1f84fb37 1.28功能提交 4 years ago
廖金灵 9af9edef0a Merge pull request '优化' (#129) from feature/add_promote_level_id into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/129
4 years ago
ELF a3d3b5722c 优化 4 years ago
郑永星 a5ed9cf3cf Merge pull request '1.28功能提交' (#128) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/128
4 years ago
zhengyongxing a1c809d7eb 1.28功能提交 4 years ago
郑永星 3d09dcf4b5 Merge pull request '1.28功能提交' (#127) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/127
4 years ago
zhengyongxing 338c0369d1 1.28功能提交 4 years ago
郑永星 8d9ca939d6 Merge pull request '1.28功能提交' (#126) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/126
4 years ago
zhengyongxing 25ec474c1c 1.28功能提交 4 years ago
郑永星 e9be27136f Merge pull request '1.28功能提交' (#121) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/121
4 years ago
zhengyongxing 77f7eda10f 1.28功能提交 4 years ago
廖金灵 dcbc152712 Merge pull request '优化' (#125) from feature/add_promote_level_id into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/125
4 years ago
ELF 4f3c21263d 优化 4 years ago
陈志 dcb2e68346 Merge pull request '优化提示' (#124) from feature/finance_payment_20210115 into release
优化提示
4 years ago
chenzhi 3947f12f54 优化提示 4 years ago
陈志 b9f83d7f15 Merge pull request '优化打款信息' (#123) from feature/finance_payment_20210115 into release
优化打款信息
4 years ago
chenzhi 9a0ba40d6d 优化打款信息 4 years ago
tping 6ed8fee113 1 4 years ago
tping de31285f85 Merge branch 'release' into feature/0128 4 years ago
tping a865b9d669 文字修改 4 years ago
zhengyongxing 88fc0e2926 1.28功能提交 4 years ago
郑永星 e1a05cb9fe Merge pull request '1.28功能提交' (#120) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/120
4 years ago
zhengyongxing 45ed2e7f16 1.28功能提交 4 years ago
郑永星 272eca3f9a Merge pull request '1.28功能提交' (#119) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/119
4 years ago
zhengyongxing 7a2e4d9033 1.28功能提交 4 years ago
郑永星 e4fb38e5f7 Merge pull request '1.28功能提交' (#118) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/118
4 years ago
zhengyongxing 3c1a7a2e61 1.28功能提交 4 years ago
郑永星 154c0989c8 Merge pull request '1.28功能提交' (#117) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/117
4 years ago
zhengyongxing 7e4f8ca78d 1.28功能提交 4 years ago
郑永星 5a232e6bb6 Merge pull request '1.28功能提交' (#116) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/116
4 years ago
zhengyongxing 3c566fb2ae 1.28功能提交 4 years ago
tping c59b8d1419 导出所有 4 years ago
tping cfd4368fe5 1 4 years ago
tping 5c22a252a3 Merge branch 'release' into feature/0128 4 years ago
tping a5b977aa00 导出所有 4 years ago
廖金灵 7194d5a945 Merge pull request '优化' (#112) from feature/add_promote_level_id into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/112
4 years ago
ELF 0aa3c514d7 优化 4 years ago
陈志 14ba644fda Merge pull request '优化提醒名词' (#111) from feature/testing_daily_count into release
Re优化提醒名词
4 years ago
chenzhi 9d9ef7a79b 优化提醒名词 4 years ago
陈志 98f9c61104 Merge pull request '优化排序' (#110) from feature/testing_daily_count into release
优化排序
4 years ago
chenzhi 746388dd00 优化排序 4 years ago
陈志 b690ef68a2 Merge pull request 'feature/testing_daily_count' (#109) from feature/testing_daily_count into release
优化菜单适配
4 years ago
chenzhi 3f88e7dc6f 优化菜单适配 4 years ago
chenzhi b19853edd3 优化菜单 4 years ago
zhengyongxing 8a49578cc4 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/add_item 4 years ago
zhengyongxing 104051d90f 1.28功能提交 4 years ago
陈志 0b55550a62 Merge pull request 'feature/testing_daily_count' (#107) from feature/testing_daily_count into release
优化首页提醒
4 years ago
chenzhi 13d0c6fa59 优化首页提醒 4 years ago