Commit Graph

6640 Commits (9f5463dd3d321dc46d78609bf580c9d0558665c2)

Author SHA1 Message Date
郑永星 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 b71995aeeb Merge branch 'release' of 8.136.139.249:wmtx/platform into hotfix/fiance_statement_bug_20210420
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号功能提交
陈志 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号功能提交
ELF 35e879d084 优化
ELF 9eadb9e0c3 优化
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 c7341d149d 优化
ELF c7b90f54a6 优化
ELF d7d78e748d 修改跨区bug