elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,988 Commits
1 Branch
0 Tags
154 MiB
Commit Graph

4428 Commits (24e4f77a98036153c34cfc47b34336a2cffa7ba5)

Author SHA1 Message Date
chenzhi a9951bd657 优化保存
chenzhi 30d6f53582 优化渠道计算
chenzhi bb2656f207 优化代码
chenzhi 844a6d501e 新增打款账号编辑
廖金灵 84c6612093 Merge pull request 'bug修复' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/310
zhengyongxing cd1fd63681 bug修复
廖金灵 eb0e44418d Merge pull request 'hotfix/partab' () from hotfix/partab into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/298
ELF c1a71bd5f1 Merge branch 'master' into release
tping a0909c6c5b 甲乙方公司
廖金灵 a9fd28e38f Merge pull request 'feature/add_item' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/294
zhengyongxing b7d4e9002d 4.23号功能提交
郑永星 d1b570be2a Merge pull request '4.23号功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/293
zhengyongxing 83cc2aa6ec 4.23号功能提交
陈志 34fcfc7675 Merge pull request 'hotfix/fiance_statement_bug_20210420' () from hotfix/fiance_statement_bug_20210420 into release 
优化关联
chenzhi b257ee8754 优化游戏关联
郑永星 b79f567e0a Merge pull request '4.23号功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/291
zhengyongxing 1a2f0ab975 4.23号功能提交
chenzhi fa19156cfb 优化bug
郑永星 49a4caaba6 Merge pull request '4.23号功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/288
zhengyongxing 671419882f 4.23号功能提交
chenzhi aa0bcef724 Merge branch 'master' of 8.136.139.249:wmtx/platform into hotfix/fiance_statement_bug_20210420
廖金灵 56e28d216e Merge pull request '版本更新' () from release into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/285
chenzhi 7ef7e66a58 优化不弹框提醒
郑永星 cc201dbd41 Merge pull request '4.22号功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/284
zhengyongxing f2e56125fe 4.22号功能提交
郑永星 9f5463dd3d Merge pull request '4.22号功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/283
zhengyongxing 69566e1839 4.22号功能提交
zhengyongxing d314e6164a 4.22号功能提交
chenzhi 72f69bd079 优化提示
chenzhi 4dd36afd45 优化icon大小限制
chenzhi d5a8c97ad3 优化图片上传
chenzhi 537c496793 优化图片上传
chenzhi b71995aeeb Merge branch 'release' of 8.136.139.249:wmtx/platform into hotfix/fiance_statement_bug_20210420
廖金灵 8375c5f9bd Merge pull request '优化独立减罚' () from hotfix/fiance_statement_bug_20210420 into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/280
chenzhi c575d4f590 优化独立减罚
郑永星 b5e8cc4ecb Merge pull request '4.22号功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/279
zhengyongxing a5aa8ef744 4.22号功能提交
郑永星 d082a7dc98 Merge pull request '4.22号功能提交' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/277
zhengyongxing 8fb73e6fed 4.22号功能提交
ELF bfa0c5c5b8 迁移优化
陈志 6d03ea4942 Merge pull request 'feature/finance_payment_20210115' () from feature/finance_payment_20210115 into release 
新增退款统计
chenzhi 06202851c2 新增退款统计
chenzhi f349603e7c 新增游戏订单退款
郑永星 80fe58ee20 Merge pull request 'feature/add_item' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/275
zhengyongxing 9080d521fd 4.22号功能提交
liyang f32d51480f 玩家列表修改
廖金灵 f5566264d9 Merge pull request '特殊补点bug修改' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/272
zhengyongxing 72077477ed 特殊补点bug修改
chenzhi c0f98f71a5 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
zhengyongxing 65e0fda02f 工会统计bug修正
chenzhi 4166112252 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
zhengyongxing a48f0214c7 归属游戏上传
chenzhi 53ae4b0f0e Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
chenzhi 6d92d9e21c 优化菜单操作
chenzhi 17945097ce 优化导出
chenzhi a327627f85 优化行为日志导出
chenzhi bae615bac0 优化子站行为日志
chenzhi 6c9ae2332b 优化管理员添加
chenzhi bea2fa7003 优化管理组子站点功能
zhengyongxing 99d281b8e1 财务打款系统bug修复
zhengyongxing c772aa6854 财务打款系统bug修复
zhengyongxing c1c0e3ac14 财务打款系统bug修复
zhengyongxing 0d5ab01f32 财务打款系统bug修复
zhengyongxing 860d389700 财务打款系统bug修复
zhengyongxing f675357a2d 财务打款系统bug修复
zhengyongxing cddf09db60 财务打款系统bug修复
zhengyongxing eda3c9bbe4 财务打款系统bug修复
zhengyongxing 110e5001ee 商务汇总修改
zhengyongxing 859fce06c4 商务奖金功能修改
zhengyongxing 7178181ebb 财务打款系统bug修复
chenzhi 2ad1ff5434 优化加入组别
chenzhi 7355546a58 优化新增用户组
zhengyongxing 01a0d7c717 财务打款系统bug修复
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
zhengyongxing 619d9d547e 商务奖金功能上传
chenzhi 8f7405bb17 优化权限
ELF d7d78e748d 修改跨区bug
chenzhi 5ea5bb2eaa 优化子站登陆
chenzhi 2a168fb907 优化子站登陆所需函数
廖金灵 69301ee537 Merge pull request '优化子站上游比例按实际结算' () from feature/finance_payment_20210115 into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/240
chenzhi 6c3aefcf55 优化子站上游比例按实际结算
tping 9d478c0bc7 1
廖金灵 64a4923564 Merge pull request '财务打款系统bug修复' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/237
zhengyongxing 2892562b2c 财务打款系统bug修复
chenzhi 96f832322c Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
chenzhi 3b447b70d0 优化公会统计
chenzhi 7ca675b520 优化推广员统计
chenzhi 6c46dd0ea5 优化汇总
chenzhi abb88719b5 新增表同步
ELF 5bf8961f14 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/testing_game_server
ELF 8dee426c5f 优化
郑永星 77532bdb08 Merge pull request 'feature/add_item' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/230
zhengyongxing 97fae33c43 公会信息功能提交
zhengyongxing f69b0ddf14 公会信息功能提交
chenzhi 57abd846c6 新增财务汇总重算
郑永星 841e875e40 Merge pull request '结算单编辑功能负数可编辑' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/228
zhengyongxing d7f13aad93 结算单编辑功能负数可编辑
廖金灵 7f3f3997fd Merge pull request 'feature/LY0309' () from feature/LY0309 into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/224
郑永星 d24d98d11d Merge pull request '市场业绩bug修复' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/227
zhengyongxing 22b17c5010 市场业绩系统bug修复
zhengyongxing c06b954bf7 市场业绩bug修复
郑永星 5fea16b821 Merge pull request '市场业绩bug修正' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/226
zhengyongxing 7c60d8321b 市场业绩bug修正
liyang a457750390 角色查询、额外额度、测试资源权限修改
廖金灵 2690db95ab Merge pull request 'feature/finance_payment_20210115' () from feature/finance_payment_20210115 into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/223
郑永星 6051f9ee2a Merge pull request '子系统上游修正' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/222
chenzhi b19d73388b 子站游戏订单bug
zhengyongxing 68c873983b 子系统上游修正
chenzhi ce90ddf3ad 优化推广员统计
廖金灵 8e571e0808 Merge pull request 'feature/finance_payment_20210115' () from feature/finance_payment_20210115 into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/219
chenzhi c91206c176 优化推广员统计
chenzhi 7c460cdb47 优化支付导出
陈志 b4277c2276 Merge pull request '优化订单换绑到江息' () from feature/finance_payment_20210115 into release 
优化订单换绑到江息
chenzhi c2303a0676 优化订单换绑到江息
郑永星 c754037b79 Merge pull request '财务子系统bug修改' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/216
zhengyongxing 2f9a822583 财务子系统bug修改
chenzhi 4f14228bab 优化子站列表
chenzhi a03993f251 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
chenzhi 1b7dae2603 优化结算同步
chenzhi c21b9f619e 新增子站结算
zhengyongxing 0332b591e8 3.22功能提交
chenzhi 8d871290f2 优化默认公司
zhengyongxing eb8c9cebc1 3.22好功能提交
chenzhi 50363297e8 优化订单数据换绑
chenzhi f670c7196a 优化提示
chenzhi 6790ab5fd3 新增订单重算及固化
chenzhi 1de381bccd 优化是否结算
chenzhi bb10181cc5 新增子站游戏订单及导出
chenzhi 8b98460242 新增备注
chenzhi 17cee767b7 子站同步脚本
chenzhi 59d1e31119 优化退款可以负数
chenzhi 7ed2855dc5 优化重算
chenzhi e7a51c41da 优化前端入口文件
chenzhi 5f3c726a05 优化游戏统计合计
chenzhi 243dce02ca 优化聚合万盟数据
chenzhi aa99f1f668 新增审核撤回
chenzhi 88d02f7be1 优化导出提醒-zyx
廖金灵 a429003fa9 Merge pull request '财务子系统bug修复' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/198
zhengyongxing 3900a4081a 财务子系统bug修复
zhengyongxing ae3ad391fd 新功能开发
廖金灵 96c6a47dd5 Merge pull request '热更修复' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/197
zhengyongxing a84a69fd56 热更修复
廖金灵 e9507ddb95 Merge pull request '热更修复汇总上游时间错误' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/194
zhengyongxing 55c75e159c 热更修复
廖金灵 df747704ba Merge pull request '2.28号功能提交' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/193
zhengyongxing 55ffc36a10 2.28号功能提交
廖金灵 bd20d4a770 Merge pull request '2.28号功能提交' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/192
zhengyongxing 4aa569d092 2.28号功能提交
陈志 f328397807 Merge pull request 'feature/finance_payment_20210115' () from feature/finance_payment_20210115 into release 
优化连接
chenzhi 75850db849 优化测试