96 Commits (0612bdd0b0fc4a63077d9a142d16eedbb7e68b7e)

Author SHA1 Message Date
zhengyongxing 9bec07c7d4 不结算bug修改 4 years ago
zhengyongxing 7c5c67a87c 编辑页面调整,及多个编辑错误修正 4 years ago
zhengyongxing 923851fea7 11月bug修复 4 years ago
zhengyongxing 0572fde5ad 11bug修复 4 years ago
chenzhi 986065ab4b 优化名词 4 years ago
chenzhi e7501be7c3 优化审核流程 4 years ago
zhengyongxing f3a45dfac6 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item 4 years ago
zhengyongxing a6263b2205 11月功能提交 4 years ago
chenzhi 5bdc0e6f6e 优化汇总方案 4 years ago
chenzhi 55dd67e34d 优化撤回 4 years ago
chenzhi 56681580dd 合并 4 years ago
chenzhi bd125be3dd 优化汇总审核流程 4 years ago
zhengyongxing f49cd75e86 11月功能提交 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 e098384635 汇总bug修改 4 years ago
zhengyongxing 3656c555d1 11月功能提交 4 years ago
zhengyongxing 4526b5b741 11月功能提交 4 years ago
chenzhi 3db0914108 优化导出公司 4 years ago
zhengyongxing 859f5b58c9 汇总功能还原修正 4 years ago
zhengyongxing f450df3265 汇总功能修正 4 years ago
zhengyongxing 54a0fde480 汇总公司与上游回退 4 years ago
zhengyongxing 0af52ad4ea 汇总金额为空时添加数据 4 years ago
zhengyongxing f0cbe3cafb 周结算金额bug修改 4 years ago
zhengyongxing 4f35cacbab 汇总模板修改提交 4 years ago
zhengyongxing c366fcfe4e 汇总编辑功能提交 4 years ago
zhengyongxing 825d4e51c9 聚合公司绑定功能修改 4 years ago
zhengyongxing 4e9bde9c10 汇总编辑提交 4 years ago
zhengyongxing 31568dd37c 聚合公司汇总编辑功能添加 4 years ago
zhengyongxing 868889fe54 汇总编辑功能提交 4 years ago
zhengyongxing fedcbd605b bug修改 4 years ago
chenzhi f169d65c1c 优化推广公司添加排序 4 years ago
chenzhi 4a3cb6f6bb Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three 4 years ago
zhengyongxing ab7ae80634 补点bug修正 4 years ago
chenzhi bcdbb3d0a0 优化导出保留两位小数 4 years ago
chenzhi f73a9033b3 新增下游个人比例 4 years ago
郑永星 1aebf2b939 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点分成金额功能修正
4 years ago
zhengyongxing eac0fc61c0 特殊补点分成金额功能修正 4 years ago
chenzhi f405faa924 优化个人汇总导出异常 4 years ago
zhengyongxing 0215082018 特殊补点bug修正 4 years ago
zhengyongxing 3022525c85 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Application/Admin/Controller/CompanyStatementPoolController.class.php
4 years ago
zhengyongxing cd331f2c64 上下游聚合打款信息修改 4 years ago
chenzhi 9234919180 优化导出 4 years ago
zhengyongxing 73dff8839e Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Application/Admin/Controller/CompanyStatementPoolController.class.php
4 years ago
chenzhi ce5a83e9bc 优化汇总导出错误 4 years ago
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
4 years ago
zhengyongxing 9265d7c9b6 上下游聚合打款信息修改 4 years ago
chenzhi 4a98c587fa 新增线下打款确认 4 years ago
chenzhi 69cf42e895 新增线下确认打款 4 years ago
chenzhi e2d179acd8 新增线下打款 4 years ago
chenzhi ed66facc8f 优化结算查看 4 years ago