7230 Commits (9eede38eaba5630067a9197eb47067cb93684d31)

Author SHA1 Message Date
廖金灵 1d8e6984c8 Merge pull request 'feature/market_department_search' (#443) from feature/market_department_search into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/443
3 years ago
ELF d8357c072e 优化 3 years ago
ELF b231f1a50f 优化 3 years ago
chenzhi eb2db36c6b 优化特殊补点市场员查看 3 years ago
ELF 4c6116e840 优化 3 years ago
chenzhi 3b97aab1ed 优化绩效 3 years ago
chenzhi 4307c6afa8 优化允许绩效为0 3 years ago
ELF 0a3027796f 返利添加游戏 3 years ago
ELF 82a70f0e05 优化 3 years ago
chenzhi bc19bec4b1 优化发放 3 years ago
chenzhi 83822e7952 定时任务删除 3 years ago
chenzhi 089390376c 优化周一定时器 3 years ago
ELF 1912e2b203 搜索 3 years ago
廖金灵 4c4a2c0b22 Merge pull request '优化充值查看' (#433) from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/433
3 years ago
chenzhi 5224094042 优化充值查看 3 years ago
廖金灵 966da30f6d Merge pull request '优化支付商户配置查看' (#432) from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/432
3 years ago
chenzhi 5bef7fb351 优化支付商户配置查看 3 years ago
廖金灵 813a05a04c Merge pull request 'feature/more_payment' (#430) from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/430
3 years ago
chenzhi ad028cd613 优化显示 3 years ago
chenzhi 41f2234108 优化充值查看 3 years ago
chenzhi 34d07e1578 优化支付查看 3 years ago
ELF f2d5faf211 封禁链接 3 years ago
ELF 55a14f9d46 优化玩家迁移 3 years ago
chenzhi 4f5fe04178 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment 3 years ago
chenzhi 7b80101707 优化初始 3 years ago
chenzhi c234f9520b 优化获市场 3 years ago
chenzhi a9400d3c0b 优化订单显示 3 years ago
chenzhi 7d3dc9f8d2 优化公会押金权限 3 years ago
chenzhi 822894ea17 优化公会查看 3 years ago
chenzhi 5ccda517b3 优化公司查看 3 years ago
chenzhi acaf3ec370 优化公会信息权限 3 years ago
chenzhi e523dc7e88 游戏比例模板权限区分 3 years ago
chenzhi 22619dff0c 优化游戏比例申请 3 years ago
chenzhi c01b370405 优化获取公司不区分市场 3 years ago
chenzhi 2ddb07426a 优化取消部门领导 3 years ago
chenzhi 3d215d57aa 优化会长添加或者换绑引起的市场变化 3 years ago
chenzhi 39dcf64803 优化下游打款统计 3 years ago
chenzhi aae58f024b 优化添加会长 3 years ago
chenzhi e97d763bc8 优化权限 3 years ago
chenzhi 29e03a1718 优化市场部提成 3 years ago
chenzhi f66b7088e3 优化 3 years ago
chenzhi b0ac054745 新增公司筛选 3 years ago
chenzhi b679708156 优化市场业绩脚本 3 years ago
chenzhi 8ebecb5517 优化市场绩效脚本 3 years ago
chenzhi 5439bd2ee0 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment 3 years ago
廖金灵 2c10246a4f Merge pull request 'feature/more_payment' (#418) from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/418
3 years ago
廖金灵 0d0ea4259a Merge pull request 'feature/game_rebate' (#420) from feature/game_rebate into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/420
3 years ago
ELF b94a463d24 优化 3 years ago
chenzhi 4b28077e12 新增市场部部门显示 3 years ago
ELF 69922e73a1 有害 3 years ago
chenzhi c89d1540e7 新增初始化数据 3 years ago
chenzhi b1ee5b0f4f 优化市场部毛利按实际换绑时间计算 3 years ago
廖金灵 2065d8c353 Merge pull request 'feature/more_payment' (#415) from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/415
3 years ago
chenzhi f5f20300c7 新增离职后无需确认绩效 3 years ago
chenzhi 5fbe327cba 新增备注 3 years ago
chenzhi c549cc703e 新增线下打款导出 3 years ago
chenzhi 4efab5c479 新增定时任务查看 3 years ago
chenzhi df3b3ad4f8 优化编辑 3 years ago
chenzhi 65be8ad894 优化毛利数据 3 years ago
chenzhi 7993af7973 设定重算时间 3 years ago
chenzhi 85f7977d1a 新增月结每周一脚本 3 years ago
chenzhi 7d64738080 任务新增预约执行 3 years ago
chenzhi e61df7adc4 优化经理绩效统计 3 years ago
chenzhi 8c2f4f7edd 聚合代码关服更新 3 years ago
chenzhi 50b491d490 优化确认查询 3 years ago
chenzhi 2bbacb15a5 新增重算按钮提示 3 years ago
chenzhi 52e7f3059f 新增经理计算 3 years ago
chenzhi 9789da2aab 优化排序 3 years ago
chenzhi f8afea93f3 优化排序 3 years ago
chenzhi fb56f1ebe7 新增市场经理 3 years ago
chenzhi 0f38a464ce 优化流水0显示 3 years ago
ELF 3b1aeaa632 修改 3 years ago
ELF 95fea8fcf6 優化到處 3 years ago
ELF faf2fdc41f 优化 3 years ago
ELF 0d08c9c5fc 优化 3 years ago
ELF 0ea585bd96 游戏返利 3 years ago
chenzhi 3de4aa185a 新增市场经理 3 years ago
廖金灵 05dd251fec Merge pull request '新增判断结算包名' (#407) from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/407
3 years ago
chenzhi 91585e6ed4 新增判断结算包名 3 years ago
廖金灵 8b14d3c3b0 Merge pull request '优化毛利计算' (#406) from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/406
3 years ago
chenzhi c5c2f7fee3 优化毛利计算 3 years ago
廖金灵 81db2f512f Merge pull request 'release' (#405) from release into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/405
3 years ago
chenzhi 1e2d8035a2 优化人事 3 years ago
chenzhi a982732fdd Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment 3 years ago
chenzhi 90b2cb4d9b 优化市场毛利 3 years ago
张谷成 56a73931ea Merge pull request '公会信息默认沟通时间降序' (#403) from feature/wx_share into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/403
3 years ago
tping aea9d193e7 公会信息默认沟通时间降序 3 years ago
chenzhi 3a905fcf59 优化数据生成 3 years ago
chenzhi 4ff9f76a5c 优化毛利统计 3 years ago
chenzhi 5ce952ef1e 优化原包名获取 3 years ago
chenzhi 5ee21eb781 暂存 3 years ago
廖金灵 50a0eab2f6 Merge pull request '商务汇总' (#400) from hotfix/remove_promote_package into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/400
3 years ago
张谷成 5598437dce Merge pull request 'feature/wx_share' (#399) from feature/wx_share into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/399
3 years ago
tping f9b1501095 权限 3 years ago
tping d8b2a161af 权限 3 years ago
tping badb3bca31 设置权限、admin、市场总监可以看所有数据 3 years ago
ELF d1aff92c99 下载bug 3 years ago
ELF 546abbfa72 添加奖金池总额 3 years ago
ELF 556e3ba624 Merge branch 'master' of 8.136.139.249:wmtx/platform into hotfix/remove_promote_package 3 years ago
ELF 1279cbfe3b 优化 3 years ago
chenzhi b156e22e83 优化首页 3 years ago
chenzhi 541c4f47da 优化登陆 3 years ago
chenzhi 4d3f1c04b8 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment 3 years ago
chenzhi 1263383533 优化内团毛利计算公式 3 years ago
廖金灵 91701f3ecc Merge pull request '修复汇总导出' (#391) from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/391
3 years ago
chenzhi d6ea8057f0 修复汇总导出 3 years ago
廖金灵 82a40a79bd Merge pull request 'feature/more_payment' (#388) from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/388
3 years ago
廖金灵 84a6b21f88 Merge pull request '优化' (#390) from hotfix/remove_promote_package into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/390
3 years ago
ELF 9fb91c4a66 优化 3 years ago
chenzhi 9abd3896f7 新增提醒 3 years ago
chenzhi 626c63fe89 取消汇总不结算信息 3 years ago
chenzhi 497d3f8f61 优化计算及导出 3 years ago
chenzhi db28185af3 优化毛利统计方式 3 years ago
chenzhi ff7f2d7469 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment 3 years ago
chenzhi d60330a093 新增商户支付导出 3 years ago
廖金灵 742bb493c1 Merge pull request 'hotfix/remove_promote_package' (#387) from hotfix/remove_promote_package into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/387
3 years ago
ELF 4e1cf805ea 优化 3 years ago
ELF 98c938c814 优化 3 years ago
ELF 78a24c78f5 优化 3 years ago
chenzhi 31fa1fcfc2 上游cp新增是否过期查询 3 years ago
chenzhi 24e4f77a98 毛利现在bug打印 3 years ago
chenzhi 4d8e7de144 新增打款确认优化 3 years ago
chenzhi 2d1da379b0 新增生效配置 3 years ago
chenzhi 79c52576c2 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment 4 years ago
chenzhi 56fa287357 优化导出 4 years ago
chenzhi 648fb3ebbf 优化内部公司改进 4 years ago
chenzhi 4b1935676b 新增内外团查询 4 years ago
chenzhi e274f863a8 新增内部公司部门查询 4 years ago
廖金灵 a0a1c5635e Merge pull request 'hotfix/remove_promote_package' (#378) from hotfix/remove_promote_package into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/378
4 years ago
ELF 6d5d40dfd2 优化 4 years ago
ELF d6efc36e9a 优化 4 years ago
廖金灵 642bcefd59 Merge pull request 'hotfix/remove_promote_package' (#375) from hotfix/remove_promote_package into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/375
4 years ago
ELF 53bf6bca07 优化 4 years ago
ELF b65a62b6ab 优化 4 years ago
ELF b8de662556 优化 4 years ago
廖金灵 175cfbf71c Merge pull request 'hotfix/remove_promote_package' (#372) from hotfix/remove_promote_package into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/372
4 years ago
ELF 9f37c6db3c 有害 4 years ago
ELF fb12b1345e 有害 4 years ago
ELF 4abcad9106 有害 4 years ago
ELF b495135215 有害 4 years ago
ELF 23feb76e09 有害 4 years ago
ELF b9092a4501 有害 4 years ago
ELF b4c1c68c42 优化 4 years ago
chenzhi c36ce00b60 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment 4 years ago
chenzhi c4849ffc7c 新增商户固定 4 years ago
ELF 80e02733e7 封禁推广员推广链接 4 years ago
廖金灵 f568c40e22 Merge pull request '金额错误bug修改' (#363) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/363
4 years ago
zhengyongxing b1c82bfd69 金额错误bug修改 4 years ago
zhengyongxing b58bdab705 金额错误bug修改 4 years ago
廖金灵 9e44ad5fe3 Merge pull request '5.27新功能时间修改' (#362) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/362
4 years ago
zhengyongxing a4bf7ff108 5.27新功能时间修改 4 years ago
廖金灵 cd33286900 Merge pull request '优化导出错误' (#361) from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/361
4 years ago
chenzhi ad49a9a419 优化导出错误 4 years ago
廖金灵 f5e42522bf Merge pull request 'feature/more_payment' (#359) from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/359
4 years ago
chenzhi f211fe6fa7 优化批量导出 4 years ago
廖金灵 bba10a23b1 Merge pull request '5.27新功能上线' (#358) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/358
4 years ago
zhengyongxing 8abf4e4eb8 5.27新功能上线 4 years ago
chenzhi 3b725f9c1d 新增汇总查看 4 years ago
chenzhi db0d49fe4b 优化合并查看 4 years ago
廖金灵 f556d7889e Merge pull request '修改' (#357) from release into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/357
4 years ago
郑永星 6b10bc1b05 Merge pull request '5.26功能上线' (#355) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/355
4 years ago
zhengyongxing 0c5dfdebf9 5.26功能上线 4 years ago
chenzhi e95087060a 优化上游逻辑 4 years ago
chenzhi 6df1f871f2 优化设置后的其他比例问题 4 years ago
陈志 a0c9d6e7a9 Merge pull request 'hotfix/change_pay_0526' (#353) from hotfix/change_pay_0526 into release
优化名称
4 years ago
chenzhi 543fc37ba2 优化名称 4 years ago
郑永星 24728cf1ec Merge pull request '5.26功能上线' (#352) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/352
4 years ago
zhengyongxing e710d5a710 5.26功能上线 4 years ago
chenzhi 7f9d2e3c97 优化类大小写 4 years ago
chenzhi 811587a33f 优化导出不和重算关联 4 years ago
陈志 a187b17cdd Merge pull request 'feature/more_payment' (#349) from feature/more_payment into release
优化上游比例
4 years ago
chenzhi 7aa29e8f3f 优化每月计算及导出 4 years ago
chenzhi 1728886f1f 优化上游比例 4 years ago
chenzhi 06f5882107 格式化数据 4 years ago
zhengyongxing 123ee98c59 5.26功能上线 4 years ago
zhengyongxing 5aeff6e3f2 5.26功能上线 4 years ago
zhengyongxing 7265ddd23e 5.26功能上线 4 years ago
chenzhi 9631a26d40 优化结算 4 years ago
郑永星 fcf3e09c1b Merge pull request '5.26功能上线' (#344) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/344
4 years ago
zhengyongxing 4f0bad5c45 5.26功能上线 4 years ago
chenzhi 013801556a 新增游戏分成比例操作时间 4 years ago
chenzhi fd285df021 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment 4 years ago
chenzhi 2ac55db936 优化导出名称 4 years ago
chenzhi 3dca998277 优化权限 4 years ago
chenzhi f269a3a961 优化导出 4 years ago
chenzhi 78b85d9b37 新增导出 4 years ago
chenzhi 365faa99a7 新增重算功能 4 years ago
chenzhi 7caaf75647 优化编辑和重算 4 years ago
chenzhi 34b30c70f6 新增编辑功能 4 years ago
廖金灵 3edcb05ed9 Merge pull request '比例体系修改' (#340) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/340
4 years ago
zhengyongxing e7c83a2811 比例体系修改 4 years ago
廖金灵 daca7679ad Merge pull request '比例体系修改' (#339) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/339
4 years ago
chenzhi cf06897d66 新增游戏毛利表 4 years ago
zhengyongxing 9c2c771be9 比例体系修改 4 years ago
廖金灵 af92816205 Merge pull request '比例体系修改' (#338) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/338
4 years ago
zhengyongxing 8749beec32 比例体系修改 4 years ago
ELF 45cea9fa42 有害 4 years ago
廖金灵 eec3495340 Merge pull request '有害' (#334) from feature/op_player_shift into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/334
4 years ago
张谷成 d254e7be32 Merge pull request '0521' (#333) from feature/company0521 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/333
4 years ago
ELF 450c8e517b 有害 4 years ago
tping 7b694b2fc8 0521 4 years ago
廖金灵 95da7866d1 Merge pull request 'feature/op_player_shift' (#332) from feature/op_player_shift into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/332
4 years ago
ELF 90d82b1a8d 有害 4 years ago
ELF 8440c5d384 优化 4 years ago
郑永星 b603435c8f Merge pull request 'feature/add_item' (#331) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/331
4 years ago
zhengyongxing 54b9373b2b 比例体系修改 4 years ago
zhengyongxing 6d3b5f05b4 比例体系修改 4 years ago
廖金灵 2722b4d8a6 Merge pull request '优化' (#330) from feature/retention_60_90 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/330
4 years ago
ELF 45460144f2 优化 4 years ago
廖金灵 6f7ac28ac1 Merge pull request '优化' (#329) from feature/retention_60_90 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/329
4 years ago
郑永星 ec656777b2 Merge pull request '比例体系修改' (#328) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/328
4 years ago
zhengyongxing cd41447eb8 比例体系修改 4 years ago
chenzhi c7c4b52c89 现在下游外团分析 4 years ago
chenzhi 180deeb2ae bug 4 years ago
chenzhi f07b29714b 新增上游分析 4 years ago
chenzhi be8e24c122 新增下游外团毛利 4 years ago
郑永星 6f1f95adc9 Merge pull request '添加用户bug修改' (#325) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/325
4 years ago
zhengyongxing da8cd1e984 添加用户bug修改 4 years ago
廖金灵 4824b34681 Merge pull request 'hotfix/cz_auth_bug' (#323) from hotfix/cz_auth_bug into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/323
4 years ago
ELF 4348e3f435 优化 4 years ago
ELF a9ec0f0116 优化 4 years ago
zhengyongxing bc975c99d6 添加用户bug修改 4 years ago
zhengyongxing ede3c9379e Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/add_item_new 4 years ago
zhengyongxing 4a0477f8c4 5.19功能提交 4 years ago
ELF 8da0b1b4b7 有害 4 years ago
廖金灵 006aefd39c Merge pull request '目录索引' (#317) from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/317
4 years ago
chenzhi 637746148f 目录索引 4 years ago
廖金灵 1e6ef0bf59 Merge pull request 'feature/more_payment' (#316) from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/316
4 years ago
chenzhi 70fb39424c 优化名称 4 years ago
chenzhi 9c0e6f7c9e 优化名称 4 years ago
廖金灵 5887df2dd7 Merge pull request 'feature/more_payment' (#315) from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/315
4 years ago
chenzhi 434009bd18 优化名称 4 years ago
chenzhi 76175989ed 优化余额说明 4 years ago
陈志 2bdf225963 Merge pull request 'feature/more_payment' (#313) from feature/more_payment into release
优化打款
4 years ago
chenzhi c9696df7ab 优化打款配置 4 years ago
chenzhi c232b649a0 优化线下打款样式 4 years ago
chenzhi d78a1edc8c 优化线下打款 4 years ago
chenzhi 44ceb3ead3 优化线下打款 4 years ago
chenzhi 5a303a6a7a 优化保存 4 years ago
chenzhi a9951bd657 优化保存 4 years ago
chenzhi 30d6f53582 优化渠道计算 4 years ago
chenzhi bb2656f207 优化代码 4 years ago
chenzhi 844a6d501e 新增打款账号编辑 4 years ago
廖金灵 0cacbd3cb7 Merge pull request 'hotfix/ymxj_testing_resource' (#312) from hotfix/ymxj_testing_resource into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/312
4 years ago
ELF 6d5cd97811 优化 4 years ago
ELF 0c3ada79dc 优化 4 years ago
廖金灵 0ca0b8ab4f Merge pull request '优化' (#311) from hotfix/ymxj_testing_resource into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/311
4 years ago
ELF 66af4f551a 优化 4 years ago
廖金灵 84c6612093 Merge pull request 'bug修复' (#310) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/310
4 years ago
zhengyongxing cd1fd63681 bug修复 4 years ago
ELF fea86b964c 优化 4 years ago
ELF 0dbc10498b 解决冲突 4 years ago
ELF 11b9ec62ba 优化 4 years ago
廖金灵 6abebc1a3c Merge pull request '乐牛添加测试资源' (#305) from hotfix/leniu_testing_res into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/305
4 years ago
ELF 0888779250 优化 4 years ago
陈志 1521212db1 Merge pull request '新增频繁操作提示页面' (#301) from feature/hom_defaultpage into release
新增频繁操作提示页面
4 years ago
chenzhi 3a7b06977f 新增频繁操作提示页面 4 years ago
ELF 8964fef141 Merge branch 'hotfix/xyws_testing_resource' into release 4 years ago
ELF bb28142282 仙影无双测试资源 4 years ago
廖金灵 eb0e44418d Merge pull request 'hotfix/partab' (#298) from hotfix/partab into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/298
4 years ago
ELF c1a71bd5f1 Merge branch 'master' into release 4 years ago
tping a0909c6c5b 甲乙方公司 4 years ago
廖金灵 834a4128d0 Merge pull request '推广后台访问限制' (#297) from hotfix/shift_repeat_bug into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/297
4 years ago
廖金灵 8ed5ca3e4c Merge pull request '优化' (#296) from hotfix/shift_repeat_bug into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/296
4 years ago
ELF 48274d2f50 优化 4 years ago
ELF c72229e6aa 优化 4 years ago
廖金灵 e270544df1 Merge pull request '推广后台每秒限制访问' (#295) from hotfix/shift_repeat_bug into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/295
4 years ago
ELF 9904d85516 优化 4 years ago
廖金灵 a9fd28e38f Merge pull request 'feature/add_item' (#294) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/294
4 years ago
zhengyongxing b7d4e9002d 4.23号功能提交 4 years ago
郑永星 d1b570be2a Merge pull request '4.23号功能提交' (#293) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/293
4 years ago
zhengyongxing 83cc2aa6ec 4.23号功能提交 4 years ago
陈志 34fcfc7675 Merge pull request 'hotfix/fiance_statement_bug_20210420' (#292) from hotfix/fiance_statement_bug_20210420 into release
优化关联
4 years ago
chenzhi b257ee8754 优化游戏关联 4 years ago
郑永星 b79f567e0a Merge pull request '4.23号功能提交' (#291) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/291
4 years ago
zhengyongxing 1a2f0ab975 4.23号功能提交 4 years ago
chenzhi fa19156cfb 优化bug 4 years ago
郑永星 49a4caaba6 Merge pull request '4.23号功能提交' (#288) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/288
4 years ago
zhengyongxing 671419882f 4.23号功能提交 4 years ago
chenzhi aa0bcef724 Merge branch 'master' of 8.136.139.249:wmtx/platform into hotfix/fiance_statement_bug_20210420 4 years ago
廖金灵 56e28d216e Merge pull request '版本更新' (#285) from release into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/285
4 years ago
chenzhi 7ef7e66a58 优化不弹框提醒 4 years ago
郑永星 cc201dbd41 Merge pull request '4.22号功能提交' (#284) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/284
4 years ago
zhengyongxing f2e56125fe 4.22号功能提交 4 years ago
郑永星 9f5463dd3d Merge pull request '4.22号功能提交' (#283) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/283
4 years ago
zhengyongxing 69566e1839 4.22号功能提交 4 years ago
zhengyongxing d314e6164a 4.22号功能提交 4 years ago
chenzhi 72f69bd079 优化提示 4 years ago
chenzhi 4dd36afd45 优化icon大小限制 4 years ago
chenzhi d5a8c97ad3 优化图片上传 4 years ago
chenzhi 537c496793 优化图片上传 4 years ago
chenzhi b71995aeeb Merge branch 'release' of 8.136.139.249:wmtx/platform into hotfix/fiance_statement_bug_20210420 4 years ago
廖金灵 8375c5f9bd Merge pull request '优化独立减罚' (#280) from hotfix/fiance_statement_bug_20210420 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/280
4 years ago
chenzhi c575d4f590 优化独立减罚 4 years ago
郑永星 b5e8cc4ecb Merge pull request '4.22号功能提交' (#279) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/279
4 years ago
zhengyongxing a5aa8ef744 4.22号功能提交 4 years ago
郑永星 d082a7dc98 Merge pull request '4.22号功能提交' (#277) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/277
4 years ago
zhengyongxing 8fb73e6fed 4.22号功能提交 4 years ago
ELF bfa0c5c5b8 迁移优化 4 years ago
陈志 6d03ea4942 Merge pull request 'feature/finance_payment_20210115' (#276) from feature/finance_payment_20210115 into release
新增退款统计
4 years ago
chenzhi 06202851c2 新增退款统计 4 years ago
chenzhi f349603e7c 新增游戏订单退款 4 years ago
郑永星 80fe58ee20 Merge pull request 'feature/add_item' (#275) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/275
4 years ago
zhengyongxing 9080d521fd 4.22号功能提交 4 years ago
ELF 35e879d084 优化 4 years ago
ELF 9eadb9e0c3 优化 4 years ago
liyang f32d51480f 玩家列表修改 4 years ago
廖金灵 f5566264d9 Merge pull request '特殊补点bug修改' (#272) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/272
4 years ago
zhengyongxing 72077477ed 特殊补点bug修改 4 years ago
chenzhi c0f98f71a5 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 4 years ago
zhengyongxing 65e0fda02f 工会统计bug修正 4 years ago
chenzhi 4166112252 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 4 years ago
zhengyongxing a48f0214c7 归属游戏上传 4 years ago
chenzhi 53ae4b0f0e Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 4 years ago
chenzhi 6d92d9e21c 优化菜单操作 4 years ago
chenzhi 17945097ce 优化导出 4 years ago
chenzhi a327627f85 优化行为日志导出 4 years ago
chenzhi bae615bac0 优化子站行为日志 4 years ago
chenzhi 6c9ae2332b 优化管理员添加 4 years ago
chenzhi bea2fa7003 优化管理组子站点功能 4 years ago
zhengyongxing 99d281b8e1 财务打款系统bug修复 4 years ago
zhengyongxing c772aa6854 财务打款系统bug修复 4 years ago
zhengyongxing c1c0e3ac14 财务打款系统bug修复 4 years ago
zhengyongxing 0d5ab01f32 财务打款系统bug修复 4 years ago
zhengyongxing 860d389700 财务打款系统bug修复 4 years ago
zhengyongxing f675357a2d 财务打款系统bug修复 4 years ago
zhengyongxing cddf09db60 财务打款系统bug修复 4 years ago
zhengyongxing eda3c9bbe4 财务打款系统bug修复 4 years ago
zhengyongxing 110e5001ee 商务汇总修改 4 years ago
zhengyongxing 859fce06c4 商务奖金功能修改 4 years ago
zhengyongxing 7178181ebb 财务打款系统bug修复 4 years ago
chenzhi 2ad1ff5434 优化加入组别 4 years ago
chenzhi 7355546a58 优化新增用户组 4 years ago
zhengyongxing 01a0d7c717 财务打款系统bug修复 4 years ago
zhengyongxing f474095a24 Merge branches 'feature/add_item' and 'release' of 8.136.139.249:wmtx/platform into feature/add_item_new
 Conflicts:
	Application/Admin/Controller/GameController.class.php
4 years ago
zhengyongxing 619d9d547e 商务奖金功能上传 4 years ago
chenzhi 8f7405bb17 优化权限 4 years ago
ELF c7341d149d 优化 4 years ago
ELF c7b90f54a6 优化 4 years ago
ELF d7d78e748d 修改跨区bug 4 years ago
chenzhi 5ea5bb2eaa 优化子站登陆 4 years ago
chenzhi 2a168fb907 优化子站登陆所需函数 4 years ago
廖金灵 8323361a9e Merge pull request '强制落地页转换' (#243) from hotfix/force_landing_page into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/243
4 years ago
ELF 15e1fff0ac 优化 4 years ago
ELF 5d92af7dcc 优化 4 years ago
廖金灵 69301ee537 Merge pull request '优化子站上游比例按实际结算' (#240) from feature/finance_payment_20210115 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/240
4 years ago
chenzhi 6c3aefcf55 优化子站上游比例按实际结算 4 years ago
tping 9d478c0bc7 1 4 years ago
廖金灵 64a4923564 Merge pull request '财务打款系统bug修复' (#237) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/237
4 years ago
zhengyongxing 2892562b2c 财务打款系统bug修复 4 years ago