Commit Graph

472 Commits (6b0de8728028b822c68aeb796ab375c48984884b)

Author SHA1 Message Date
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 修改
ELF 9c59ba06e2 修改
ELF 3383b3d2d9 修改
zhengyongxing d5e7546c51 市场结算管理市场业绩公式修正
ELF 49751b8760 测试资源修改
chenzhi 0f284cf9b3 优化游戏绑定,已经绑定不出现
ELF edb090feca 解决冲突
ELF 004b540a63 解决冲突
ELF 0803b686c3 解决冲突
ELF 49ea782f7c 解决冲突
zhengyongxing 4f681f7d72 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Data/update.sql
zhengyongxing 11ff884e6a Merge branch 'feature/cp_juhe_company' into hotfix/market_percentage
# Conflicts:
#	Application/Admin/Common/extend.php
#	Application/Admin/Controller/AggregateFinanceSetController.class.php
#	Application/Admin/Controller/CpJuheCompanyController.class.php
#	Application/Admin/View/CpJuheCompany/detail.html
#	Application/Admin/View/CpJuheCompany/export.html
#	Data/update.sql