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

2218 Commits (80e02733e7dda3991718bffb69bf385c7ff9d242)

Author SHA1 Message Date
郑永星 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
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 d5a8c97ad3 优化图片上传 4 years ago
chenzhi 537c496793 优化图片上传 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
陈志 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
chenzhi 53ae4b0f0e Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 4 years ago
chenzhi bea2fa7003 优化管理组子站点功能 4 years ago
zhengyongxing 860d389700 财务打款系统bug修复 4 years ago
zhengyongxing f675357a2d 财务打款系统bug修复 4 years ago
zhengyongxing 859fce06c4 商务奖金功能修改 4 years ago
zhengyongxing 7178181ebb 财务打款系统bug修复 4 years ago
chenzhi 7355546a58 优化新增用户组 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
ELF d7d78e748d 修改跨区bug 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
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 f69b0ddf14 公会信息功能提交 4 years ago
chenzhi 57abd846c6 新增财务汇总重算 4 years ago
郑永星 841e875e40 Merge pull request '结算单编辑功能负数可编辑' (#228) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/228
 4 years ago
zhengyongxing d7f13aad93 结算单编辑功能负数可编辑 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
廖金灵 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
郑永星 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 c21b9f619e 新增子站结算 4 years ago
zhengyongxing 0332b591e8 3.22功能提交 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 bb10181cc5 新增子站游戏订单及导出 4 years ago
chenzhi 59d1e31119 优化退款可以负数 4 years ago
chenzhi e7a51c41da 优化前端入口文件 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
廖金灵 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
郑永星 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 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
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 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
廖金灵 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 e008e14046 额外额度计算修改 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