Commit Graph

483 Commits (343ecc85877eede03f50af405838b25c4277dcb6)

Author SHA1 Message Date
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
zhengyongxing 6a86a5e76f 12.18功打款能提交
zhengyongxing 8a6191810b 12.18功打款能提交
zhengyongxing 7c4e0e7521 12.18功能提交
zhengyongxing 8430fa1813 12.18功能提交
廖金灵 342b592976 Merge pull request 'feature/testing_resource_verify_admin' () from feature/testing_resource_verify_admin into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/11
zhengyongxing 27ffddfe75 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
# Conflicts:
#	Data/update.sql
zhengyongxing 7e41ad1e18 12月功能提交
ELF 78caa452b2 测试资源添加审核人
zhengyongxing 2758c608ad 编辑扣款旧的验证添加
zhengyongxing baca13a95e 换行字数修正
zhengyongxing b32f5efd91 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_item_others
 Conflicts:
	Data/update.sql
elf@home dd66846e68 根据推广公司配置推广后台
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
zhengyongxing 4526b5b741 11月功能提交
ELF dd71ccdf83 修改
zhengyongxing 0f44573fe2 市场业绩提交
zhengyongxing bb5547fb6f Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_item_other
 Conflicts:
	Data/update.sql
ELF 8c8d01a446 修改评级
zhengyongxing 5c497b94dc 分成比例导出修正
zhengyongxing 2848f0ce90 外团推广游戏功能高亮显示
zhengyongxing e30cd2fea7 外团推广功能提交
zhengyongxing a00834e4e5 外团推广功能不结算提交
zhengyongxing 9bf3c89659 特殊比例与模板比例添加流水类型
ELF 06bd640c79 修改
ELF 263e35c097 初步提交
zyx f028794473 Merge branches 'feature/add_item' and 'master' of 47.111.118.107:wmtx/platform into feature/add_item
 Conflicts:
	Data/update.sql
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
zhengyongxing ef0c4427ce Merge branches 'feature/add_item' and 'master' of 47.111.118.107:wmtx/platform into feature/add_item
 Conflicts:
	Data/update.sql
zhengyongxing b4bdcd24fc 汇总bug流程修正
ELF 2ae89b9edb 解决冲突
ELF afad195062 修改
ELF 19c782b053 解决冲突
zhengyongxing f757c10c61 绑定公司修正
zhengyongxing 1e67b1d1a1 汇总bug修正
zhengyongxing a1ac92dc02 押金bug修正
ELF 268ea4e34d 修改
zhengyongxing a19f668687 财务汇总功能撤回审批修改
zhengyongxing fedcbd605b bug修改
ELF 16122d5d9f 修改
ELF 6e2fda1e26 解决冲突
ELF 32bc839dcd 合并
zhengyongxing 24e33ed8ba Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Data/update.sql
elf@home 50755b89c5 修改
ELF 2a52df9ebb 测试资源权限
zhengyongxing 250d2ac2c0 市场业绩毛利修改
ELF 06c4d5f1f1 优化测试资源
ELF 367345ea8d 修改
elf@home 461f347b1a 修改
ELF ecf460e7c9 修改