7960 Commits (80e02733e7dda3991718bffb69bf385c7ff9d242)
 

Author SHA1 Message Date
zhengyongxing 72077477ed 特殊补点bug修改 4 years ago
廖金灵 036ef1943c Merge pull request 'feature/finance_payment_20210115' (#270) from feature/finance_payment_20210115 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/270
4 years ago
chenzhi c0f98f71a5 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 4 years ago
廖金灵 74100558e5 Merge pull request '工会统计bug修正' (#267) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/267
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
廖金灵 6537ed25a1 Merge pull request '归属游戏上传' (#266) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/266
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
廖金灵 ecdbdf86b3 Merge pull request '版本更新' (#265) from release into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/265
4 years ago
chenzhi 6c9ae2332b 优化管理员添加 4 years ago
chenzhi bea2fa7003 优化管理组子站点功能 4 years ago
郑永星 2e21ea7c38 Merge pull request '财务打款系统bug修复' (#264) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/264
4 years ago
zhengyongxing 99d281b8e1 财务打款系统bug修复 4 years ago
郑永星 d9bb095056 Merge pull request '财务打款系统bug修复' (#263) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/263
4 years ago
zhengyongxing c772aa6854 财务打款系统bug修复 4 years ago
郑永星 9ad37cde30 Merge pull request '财务打款系统bug修复' (#262) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/262
4 years ago
zhengyongxing c1c0e3ac14 财务打款系统bug修复 4 years ago
郑永星 e5a2f7ceea Merge pull request '财务打款系统bug修复' (#261) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/261
4 years ago
zhengyongxing 0d5ab01f32 财务打款系统bug修复 4 years ago
郑永星 1239b87ce1 Merge pull request '财务打款系统bug修复' (#260) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/260
4 years ago
zhengyongxing 860d389700 财务打款系统bug修复 4 years ago
郑永星 73969d69b8 Merge pull request '财务打款系统bug修复' (#259) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/259
4 years ago
zhengyongxing f675357a2d 财务打款系统bug修复 4 years ago
郑永星 fc567339db Merge pull request '财务打款系统bug修复' (#255) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/255
4 years ago
zhengyongxing cddf09db60 财务打款系统bug修复 4 years ago
zhengyongxing eda3c9bbe4 财务打款系统bug修复 4 years ago
郑永星 f5b8c5d0dc Merge pull request '商务汇总修改' (#254) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/254
4 years ago
zhengyongxing 110e5001ee 商务汇总修改 4 years ago
郑永星 9fd18898a1 Merge pull request '商务奖金功能修改' (#252) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/252
4 years ago
zhengyongxing 859fce06c4 商务奖金功能修改 4 years ago
郑永星 5ba38df841 Merge pull request '财务打款系统bug修复' (#251) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/251
4 years ago
zhengyongxing 7178181ebb 财务打款系统bug修复 4 years ago
chenzhi 2ad1ff5434 优化加入组别 4 years ago
chenzhi 7355546a58 优化新增用户组 4 years ago
郑永星 4a302f6743 Merge pull request '财务打款系统bug修复' (#249) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/249
4 years ago
zhengyongxing 01a0d7c717 财务打款系统bug修复 4 years ago
郑永星 f3cb29bd31 Merge pull request '商务奖金功能上传' (#248) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/248
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
廖金灵 260ef91ce8 Merge pull request '修改测试资源跨区bug' (#247) from hotfix/testing_resource_over_bug into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/247
4 years ago
廖金灵 ae2fcae2a4 Merge pull request '优化' (#246) from hotfix/testing_resource_over_bug into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/246
4 years ago
ELF c7341d149d 优化 4 years ago
廖金灵 061fe402fa Merge pull request '优化' (#245) from hotfix/testing_resource_over_bug into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/245
4 years ago
ELF c7b90f54a6 优化 4 years ago