Commit Graph

3304 Commits (288078c959bbea5e8c0deda677d1e9e6f4ba9e73)

Author SHA1 Message Date
zhengyongxing 288078c959 上游导出修正
zhengyongxing 7a04411e4d 特殊补点与其他汇总重算功能区分添加限制
zhengyongxing e94994993a 特殊补点无法重算限制
zhengyongxing ba80668560 特殊补点权限
zhengyongxing 1c08d1a221 比例格式修正
zhengyongxing f18f3ce7e2 比例与日期格式修正
zhengyongxing 5acd5197ae 小bug修改
zhengyongxing 19c7f7db0d 特殊补点加入下游结算中
zhengyongxing eac0fc61c0 特殊补点分成金额功能修正
zhengyongxing a29a8e43ff 特殊补点bug修正
zhengyongxing a146dd820a 平台结算导出与列表选项修改
zhengyongxing b14d2d197c 市场专员业绩下游流水及特殊补点功能提交
zhengyongxing 3b2ddded90 特殊比例功能修正
zhengyongxing 418d5a6bda 特殊比例申请功能提交
zhengyongxing 23555f8d4d 特殊补点功能修改
zhengyongxing 0215082018 特殊补点bug修正
zhengyongxing 3022525c85 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Application/Admin/Controller/CompanyStatementPoolController.class.php
zhengyongxing cd331f2c64 上下游聚合打款信息修改
chenzhi 9234919180 优化导出
chenzhi 6cb4ecb930 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
zhengyongxing 2c005d1996 特殊补点汇总功能修改
zhengyongxing 4ed51cb112 上下游聚合打款信息修改
chenzhi c795e5de6c 优化下游个人汇总样式
zhengyongxing f4aeae340d 特殊补点功能修正
zhengyongxing 565d3c9576 特殊补点功能修改
zhengyongxing 73dff8839e Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Application/Admin/Controller/CompanyStatementPoolController.class.php
陈志 8fbf101e88 Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化汇总导出错误
chenzhi ce5a83e9bc 优化汇总导出错误
zhengyongxing 50495e73ca 特殊补点功能修改
zhengyongxing 6103908d83 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Application/Admin/Controller/CompanyStatementController.class.php
	Application/Admin/Controller/CompanyStatementPoolController.class.php
zhengyongxing 872de1ff73 上下游聚合打款信息修改
zhengyongxing b75e0725a1 特殊补点功能修改
zhengyongxing 9265d7c9b6 上下游聚合打款信息修改
陈志 fbdab69c71 Merge branch 'hotfix/add_company_partner' of wmtx/platform into release
优化上游添加错误
chenzhi 57b692cd67 优化上游添加错误
chenzhi 180332ab87 优化下游未汇总导出
chenzhi 4a98c587fa 新增线下打款确认
chenzhi 69cf42e895 新增线下确认打款
chenzhi e2d179acd8 新增线下打款
zhengyongxing 9000533644 下游公司功能提交
zhengyongxing 24e33ed8ba Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Data/update.sql
chenzhi b35d0a0e95 新增删除日志
chenzhi 79468aa6f2 新增结算删除
chenzhi 36d72848bb 优化市场专员
chenzhi a18df8c6fb 优化下游个人多比例结算
chenzhi ed66facc8f 优化结算查看
zyx 89801c1467 特殊补点功能完善
zhengyongxing e6bc6853aa 特殊补点结算功能添加
chenzhi ff19f3259f 优化下游公司多比例结算
chenzhi 492d7a8f73 优化获取比例