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

7151 Commits (9582f96b922b51e1f8906fef3985d7fe7932e0d6)

Author SHA1 Message Date
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
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
廖金灵 d6dfae336b Merge pull request '修改九天仙尘落地页名称显示' (#235) from hotfix/special_game_name into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/235
 4 years ago
ELF 6bc17ad982 修改九天仙尘落地页名称显示 4 years ago
chenzhi 7ca675b520 优化推广员统计 4 years ago
chenzhi 6c46dd0ea5 优化汇总 4 years ago
chenzhi abb88719b5 新增表同步 4 years ago
ELF a2bd05ceac Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/testing_game_server 4 years ago
廖金灵 a4bbe4fe39 Merge pull request '修复' (#232) from feature/LY0309 into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/232
 4 years ago
ELF 7bb9aa833c 优化 4 years ago
liyang a960ed7c0c 修复 4 years ago
ELF e5d4c2e231 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/testing_game_server 4 years ago
廖金灵 1b4fb17d2c Merge pull request 'feature/LY0309' (#231) from feature/LY0309 into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/231
 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
liyang da588a3d86 修复 4 years ago
廖金灵 9973e72bf3 Merge pull request 'feature/add_item' (#229) from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/229
 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
liyang 42a8fc94f7 角色查询-本推广号 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
廖金灵 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 5cd8ca2857 角色查询、额外额外、测试资源权限修改 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
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
zhengyongxing c7730d5d06 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/add_item 4 years ago
ELF 9e68e40200 解决冲突 4 years ago
chenzhi 2658c50c3a 新增测试资源统计 4 years ago
ELF 531b94bae8 版本 4 years ago
郑永星 f4bb1cc5e2 Merge pull request '1.28功能提交' (#105) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/105
 4 years ago
zhengyongxing f710113820 1.28功能提交 4 years ago
郑永星 fec6edf48c Merge pull request '1.28功能提交' (#104) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/104
 4 years ago
zhengyongxing 14be887ebb 1.28功能提交 4 years ago
郑永星 747082fc0d 1.28功能提交 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/103
 4 years ago
zhengyongxing ee463829d2 1.28功能提交 4 years ago
chenzhi 2e2ff8e1d7 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 4 years ago
chenzhi 027c803343 优化打款备注 4 years ago
郑永星 31d831e39a Merge pull request '1.28功能提交' (#101) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/101
 4 years ago
zhengyongxing 0080dc75d7 1.28功能提交 4 years ago
chenzhi a845ff4d84 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 4 years ago
elf@home 34e25f293a 推广员添加每级id 4 years ago
郑永星 6c1c82b649 Merge pull request '1.28功能提交' (#100) from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/100
 4 years ago
zhengyongxing 58e8efbd7f 1.28功能提交 4 years ago
zhengyongxing deff984922 1.28功能提交 4 years ago
廖金灵 e31fec8a5c Merge pull request '修改' (#98) from feature/jpck into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/98
 4 years ago
ELF d08df7feba 修改 4 years ago
陈志 3df6e7246a Merge pull request 'feature/finance_payment_20210115' (#97) from feature/finance_payment_20210115 into release 
新增线上转线下打款
 4 years ago
chenzhi 684ea81b6a 新增线上转线下打款 4 years ago
廖金灵 293f2941be Merge pull request '剑破长空测试资源接口' (#96) from feature/jpck into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/96
 4 years ago
ELF 07c95d2ea7 剑破长空测试资源 4 years ago
chenzhi 7617ee8a4c 优化支付导出 4 years ago
chenzhi 28eedef4ed 优化支付宝信息更新 4 years ago
chenzhi 1427e7e744 新增更新支付信息功能ok 4 years ago
郑永星 af3a48f0d8 Merge pull request '奖惩限制逻辑修改' (#94) from hotfix/reward_limit into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/94
 4 years ago
zhengyongxing 508f4abef1 奖惩限制逻辑修改 4 years ago
zhengyongxing 963e806218 奖惩限制逻辑修改 4 years ago
zhengyongxing 14a0e564e1 Merge branch 'release' of 8.136.139.249:wmtx/platform into hotfix/rewardlimit 4 years ago
zhengyongxing 2366a215a2 奖惩先去除限制逻辑 4 years ago
zhengyongxing b7c671ef1c 结算单汇总功能提交 4 years ago
chenzhi c45d82ff75 取消打款查看 4 years ago
zhengyongxing 99acaed972 公会信息登记功能补充 4 years ago
zhengyongxing eb6e027ef7 汇总结算单导出功能补充 4 years ago
zhengyongxing 6243ca60cf Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/add_item_two 
 Conflicts:
	Application/Admin/Controller/SocietyInfoController.class.php
	Public/static/area.js
 4 years ago
zhengyongxing a199a12d4b 工会信息bug修改 4 years ago
zhengyongxing 64a565d908 1.28功能提交 4 years ago
zhengyongxing 0fe7e58c61 市场业绩离职功能提交导出修正 4 years ago
zhengyongxing c9ef39ada9 市场业绩离职功能提交导出修正 4 years ago
zhengyongxing d3e9f113ba 市场业绩离职功能提交导出修正 4 years ago