elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,241 Commits
1 Branch
0 Tags
154 MiB
master
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '2fb7c989c5'
${ noResults }
Commit Graph

3607 Commits (2fb7c989c5c7ec9c88f2e45dca6929b1ba771c3e)

Author SHA1 Message Date
chenzhi 79c52576c2 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment 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 d6efc36e9a 优化 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
廖金灵 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
郑永星 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
陈志 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 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 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
廖金灵 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 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
廖金灵 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
陈志 2bdf225963 Merge pull request 'feature/more_payment' (#313) from feature/more_payment into release 
优化打款
 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
廖金灵 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 c1a71bd5f1 Merge branch 'master' into release 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
郑永星 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
郑永星 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 d314e6164a 4.22号功能提交 4 years ago
chenzhi 4dd36afd45 优化icon大小限制 4 years ago
chenzhi d5a8c97ad3 优化图片上传 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
郑永星 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
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
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 d7d78e748d 修改跨区bug 4 years ago
chenzhi 5ea5bb2eaa 优化子站登陆 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
chenzhi 96f832322c Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 4 years ago
chenzhi 3b447b70d0 优化公会统计 4 years ago
chenzhi 7ca675b520 优化推广员统计 4 years ago
chenzhi 6c46dd0ea5 优化汇总 4 years ago
chenzhi abb88719b5 新增表同步 4 years ago
ELF 5bf8961f14 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/testing_game_server 4 years ago
ELF 8dee426c5f 优化 4 years ago
郑永星 77532bdb08 Merge pull request 'feature/add_item' (#230) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/230
 4 years ago
zhengyongxing 97fae33c43 公会信息功能提交 4 years ago
zhengyongxing f69b0ddf14 公会信息功能提交 4 years ago
chenzhi 57abd846c6 新增财务汇总重算 4 years ago
廖金灵 7f3f3997fd Merge pull request 'feature/LY0309' (#224) from feature/LY0309 into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/224
 4 years ago
郑永星 d24d98d11d Merge pull request '市场业绩bug修复' (#227) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/227
 4 years ago
zhengyongxing 22b17c5010 市场业绩系统bug修复 4 years ago
zhengyongxing c06b954bf7 市场业绩bug修复 4 years ago
郑永星 5fea16b821 Merge pull request '市场业绩bug修正' (#226) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/226
 4 years ago
zhengyongxing 7c60d8321b 市场业绩bug修正 4 years ago
liyang a457750390 角色查询、额外额度、测试资源权限修改 4 years ago
廖金灵 2690db95ab Merge pull request 'feature/finance_payment_20210115' (#223) from feature/finance_payment_20210115 into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/223
 4 years ago
郑永星 6051f9ee2a Merge pull request '子系统上游修正' (#222) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/222
 4 years ago
chenzhi b19d73388b 子站游戏订单bug 4 years ago
zhengyongxing 68c873983b 子系统上游修正 4 years ago
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
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 6790ab5fd3 新增订单重算及固化 4 years ago
chenzhi 1de381bccd 优化是否结算 4 years ago
chenzhi bb10181cc5 新增子站游戏订单及导出 4 years ago
chenzhi 8b98460242 新增备注 4 years ago
chenzhi 17cee767b7 子站同步脚本 4 years ago
chenzhi 7ed2855dc5 优化重算 4 years ago
chenzhi 5f3c726a05 优化游戏统计合计 4 years ago
chenzhi 243dce02ca 优化聚合万盟数据 4 years ago