6477 Commits (825d4e51c9753f0d98fd9c770a1a2dfeaa43d653)
 

Author SHA1 Message Date
郑永星 5a60c36b7a Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点bug修正
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
陈志 b80d36395a Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化导出
4 years ago
chenzhi 9234919180 优化导出 4 years ago
陈志 a78188632f Merge branch 'feature/finance_statement_three' of wmtx/platform into release 4 years ago
chenzhi 6cb4ecb930 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three 4 years ago
郑永星 e3a19c8fc6 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点汇总功能修改
4 years ago
zhengyongxing 2c005d1996 特殊补点汇总功能修改 4 years ago
zhengyongxing 4ed51cb112 上下游聚合打款信息修改 4 years ago
chenzhi c795e5de6c 优化下游个人汇总样式 4 years ago
郑永星 23966187c0 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点功能修正
4 years ago
zhengyongxing f4aeae340d 特殊补点功能修正 4 years ago
郑永星 d0aec76e3e Merge branch 'hotfix/market_percentage' of wmtx/platform into release 4 years ago
zhengyongxing 565d3c9576 特殊补点功能修改 4 years ago
陈志 faa628977b Merge branch 'hotfix/market_percentage' of wmtx/platform into release 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
陈志 8fbf101e88 Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化汇总导出错误
4 years ago
chenzhi ce5a83e9bc 优化汇总导出错误 4 years ago
zhengyongxing 50495e73ca 特殊补点功能修改 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 872de1ff73 上下游聚合打款信息修改 4 years ago
zhengyongxing b75e0725a1 特殊补点功能修改 4 years ago
zhengyongxing 9265d7c9b6 上下游聚合打款信息修改 4 years ago
ELF 1fbb9f097e ss 4 years ago
ELF 53f2649d9a ss 4 years ago
ELF 32bc839dcd 合并 4 years ago
陈志 fbdab69c71 Merge branch 'hotfix/add_company_partner' of wmtx/platform into release
优化上游添加错误
4 years ago
ELF e0bbec0978 修改 4 years ago
廖金灵 fcb2027dc8 Merge branch 'hotfix/add_company_partner' of wmtx/platform into master
优化上游添加错误
4 years ago
chenzhi 57b692cd67 优化上游添加错误 4 years ago
陈志 be2851cecc Merge branch 'feature/finance_statement_three' of wmtx/platform into release 4 years ago
chenzhi 180332ab87 优化下游未汇总导出 4 years ago
ELF ad2037408d 优化 4 years ago
陈志 25a9ea7262 Merge branch 'feature/finance_statement_three' of wmtx/platform into release
新增线下打款确认
4 years ago
chenzhi 4a98c587fa 新增线下打款确认 4 years ago
ELF 7614d5feca 修改 4 years ago
ELF 9d041f7c8a 修改 4 years ago
ELF e441f030c0 优化 4 years ago
ELF e9038d7471 ss 4 years ago
chenzhi 69cf42e895 新增线下确认打款 4 years ago
ELF 9b88e97672 修改 4 years ago
ELF 296e378501 修改 4 years ago
ELF e4854aca3a 修改 4 years ago
chenzhi e2d179acd8 新增线下打款 4 years ago
zhengyongxing 9000533644 下游公司功能提交 4 years ago
ELF 1a14ed8dc7 修改 4 years ago
zhengyongxing 24e33ed8ba Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Data/update.sql
4 years ago
chenzhi b35d0a0e95 新增删除日志 4 years ago