503 Commits (b67256f1904263d566cba1f8930596d69c4235c5)

Author SHA1 Message Date
elf e450003f8e 修改 2 years ago
elf 3a192b1f2b 优化 3 years ago
elf f84db48ce1 优化 3 years ago
elf 6b7276c344 优化 3 years ago
ELF 48dc7892dc 优化 3 years ago
ELF d188bb9072 玄灵契约返利 3 years ago
ELF 55a14f9d46 优化玩家迁移 3 years ago
ELF faf2fdc41f 优化 3 years ago
ELF 1279cbfe3b 优化 3 years ago
ELF 9fb91c4a66 优化 3 years ago
zhengyongxing 4f0bad5c45 5.26功能上线 4 years ago
zhengyongxing 83cc2aa6ec 4.23号功能提交 4 years ago
zhengyongxing 619d9d547e 商务奖金功能上传 4 years ago
zhengyongxing eb8c9cebc1 3.22好功能提交 4 years ago
zhengyongxing 4425750972 2.28号功能提交 4 years ago
ELF 9e68e40200 解决冲突 4 years ago
ELF 531b94bae8 版本 4 years ago
zhengyongxing deff984922 1.28功能提交 4 years ago
zhengyongxing 6e767a739c 市场业绩功能提交 4 years ago
zhengyongxing 07ee17ca1d 公会信息录入功能添加 4 years ago
zhengyongxing 3c166a913e Merge branch 'feature/update_payment' into feature/add_item
# Conflicts:
#	Application/Admin/Controller/CompanyStatementOfflineController.class.php
#	Application/Admin/Controller/StatementMangementController.class.php
#	Application/Payment/Controller/PaymentController.class.php
#	Application/Payment/View/Payment/lists.html
#	Data/update.sql
4 years ago
zhengyongxing 6a86a5e76f 12.18功打款能提交 4 years ago
zhengyongxing 8a6191810b 12.18功打款能提交 4 years ago
zhengyongxing 7c4e0e7521 12.18功能提交 4 years ago
zhengyongxing 8430fa1813 12.18功能提交 4 years ago
廖金灵 342b592976 Merge pull request 'feature/testing_resource_verify_admin' (#11) from feature/testing_resource_verify_admin into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/11
4 years ago
zhengyongxing 27ffddfe75 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
# Conflicts:
#	Data/update.sql
4 years ago
zhengyongxing 7e41ad1e18 12月功能提交 4 years ago
ELF 78caa452b2 测试资源添加审核人 4 years ago
zhengyongxing 2758c608ad 编辑扣款旧的验证添加 4 years ago
zhengyongxing baca13a95e 换行字数修正 4 years ago
zhengyongxing b32f5efd91 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_item_others
 Conflicts:
	Data/update.sql
4 years ago
elf@home dd66846e68 根据推广公司配置推广后台 4 years ago
zhengyongxing 6811eb806c Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/add_item
 Conflicts:
	Application/Admin/Controller/CompanyStatementPoolController.class.php
	Application/Admin/Controller/CompanyStatementSetController.class.php
	Data/update.sql
4 years ago
zhengyongxing 4526b5b741 11月功能提交 4 years ago
ELF dd71ccdf83 修改 4 years ago
zhengyongxing 0f44573fe2 市场业绩提交 4 years ago
zhengyongxing bb5547fb6f Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_item_other
 Conflicts:
	Data/update.sql
4 years ago
ELF 8c8d01a446 修改评级 4 years ago
zhengyongxing 5c497b94dc 分成比例导出修正 4 years ago
zhengyongxing 2848f0ce90 外团推广游戏功能高亮显示 4 years ago
zhengyongxing e30cd2fea7 外团推广功能提交 4 years ago
zhengyongxing a00834e4e5 外团推广功能不结算提交 4 years ago
zhengyongxing 9bf3c89659 特殊比例与模板比例添加流水类型 4 years ago
ELF 06bd640c79 修改 4 years ago
ELF 263e35c097 初步提交 4 years ago
zyx f028794473 Merge branches 'feature/add_item' and 'master' of 47.111.118.107:wmtx/platform into feature/add_item
 Conflicts:
	Data/update.sql
4 years ago
zhengyongxing d849598540 Merge branches 'feature/add_item_release' and 'release' of 47.111.118.107:wmtx/platform into feature/add_item_release
 Conflicts:
	Data/update.sql
4 years ago
zhengyongxing ef0c4427ce Merge branches 'feature/add_item' and 'master' of 47.111.118.107:wmtx/platform into feature/add_item
 Conflicts:
	Data/update.sql
4 years ago
zhengyongxing b4bdcd24fc 汇总bug流程修正 4 years ago