Commit Graph

1815 Commits (e916641647a4daa4830e2dfc4978892eea05a564)

Author SHA1 Message Date
廖金灵 a2a9625933 Merge branch 'feature/add_item' of wmtx/platform into master
聚合公司汇总公司添加,公司绑定编辑开放
zhengyongxing 01df95637a 汇总bug修正
zhengyongxing 3f78880f7d 汇总bug修正
chenzhi f311da5208 优化银行卡号不限制
zyx 5bec0ba91c 汇总状态的操作修改
zyx c99cad808c 汇总状态的操作修改
zyx 041006e1b4 汇总状态的操作修改
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 4210bb7bf0 汇总bug修正
zhengyongxing b4bdcd24fc 汇总bug流程修正
万盟天下 9db2434d10 Merge branch 'feature/add_item' of wmtx/platform into master
聚合公司绑定流程优化
zhengyongxing 2b4ed15a30 聚合公司绑定流程优化
万盟天下 1cb13ebb4c Merge branch 'feature/add_item' of wmtx/platform into master
聚合汇总bug修正
zhengyongxing a2b085562d 聚合汇总bug修正
郑永星 bdcc9a8e27 Merge branch 'hotfix/game_ratio_modify' of wmtx/platform into release
特殊比例bug修正
zhengyongxing 0dd7bceb3f 特殊比例bug修正
ELF 19c782b053 解决冲突
zhengyongxing c06e53ab31 汇总bug修正
zhengyongxing 1e67b1d1a1 汇总bug修正
zhengyongxing a1ac92dc02 押金bug修正
ELF 268ea4e34d 修改
zhengyongxing ce0196afea 押金bug修正
zhengyongxing 465f095dc4 市场业绩bug修正
zhengyongxing 5c65f356b2 市场业绩开发类型修正
zhengyongxing 15ad0a902b Merge branches 'feature/add_item' and 'release' of 47.111.118.107:wmtx/platform into feature/add_item
 Conflicts:
	Data/update.sql
zhengyongxing dab8251c11 Merge branches 'feature/company_export_change' and 'release' of 47.111.118.107:wmtx/platform into feature/company_export_change
 Conflicts:
	Application/Admin/Controller/AggregateFinanceStatementController.class.php
	Data/update.sql
zhengyongxing bc084fa2e1 汇总编辑小数点保留两位
zhengyongxing a86fab6bf6 聚合公司绑定功能修改
zhengyongxing 984619e310 汇总审批撤回bug修改
zhengyongxing a19f668687 财务汇总功能撤回审批修改
zhengyongxing 2cdc4e815b 下游公司cp比例修改
zhengyongxing 28f73f3140 公司比例格式修改
zhengyongxing 995a860016 汇总编辑功能修改
zhengyongxing c366fcfe4e 汇总编辑功能提交
zhengyongxing 825d4e51c9 聚合公司绑定功能修改
zhengyongxing e8e190a7eb 聚合公司绑定功能修改
zhengyongxing 4e9bde9c10 汇总编辑提交
zhengyongxing 9a6bc50eca 聚合公司绑定编辑修改
zhengyongxing d937dbad55 聚合公司绑定功能修改
zhengyongxing 31568dd37c 聚合公司汇总编辑功能添加
zhengyongxing 4cf512779a 聚合公司绑定功能及汇总提示语添加
zhengyongxing 868889fe54 汇总编辑功能提交
zhengyongxing 58bd48997f 汇总编辑功能提交
ELF ad34536256 修改
zhengyongxing 0b745ea817 个人汇总添加退款
zhengyongxing ee2304d664 结算性质名词修改
zhengyongxing fedcbd605b bug修改
zhengyongxing ca03b8701f 聚合页面名称修改
zhengyongxing 518c902b2a 发起汇总修正
zhengyongxing ceef36a7d1 内部公司功能完善