64 Commits (8617ad3e917550f144f15196e613c13066994e2b)

Author SHA1 Message Date
zhengyongxing 0572fde5ad 11bug修复 4 years ago
zhengyongxing b54b37e99c 换行字数修正 4 years ago
zhengyongxing 4526b5b741 11月功能提交 4 years ago
zhengyongxing ff46e189cc 聚合结算单导出公式添加 4 years ago
zhengyongxing 053e8acb8f 汇总导出bug修正 4 years ago
zhengyongxing 1f31244d10 聚合汇总导出bug修改 4 years ago
zhengyongxing ac5c1a199c 聚合结算单导出bug修正 4 years ago
zyx 3db4fe1f60 聚合结算单导出个人与公司导出不相同 4 years ago
zyx b92ce713b3 聚合结算单上线 4 years ago
zhengyongxing f72bb66356 导出公式添加 4 years ago
zhengyongxing f1308fce73 汇总bug修正 4 years ago
zhengyongxing 3f78880f7d 汇总bug修正 4 years ago
zyx a2d68a2752 汇总状态的操作修改 4 years ago
zyx 5bec0ba91c 汇总状态的操作修改 4 years ago
zyx 4a7915ef69 汇总状态的操作修改 4 years ago
zyx d42cd15b0b 汇总状态的操作修改 4 years ago
zyx 041006e1b4 汇总状态的操作修改 4 years ago
zyx 2c5889cd50 汇总状态的操作修改 4 years ago
zyx c692e51fa7 汇总状态的操作修改 4 years ago
zyx 52f4cbacb9 汇总状态的操作修改 4 years ago
zyx 178c86a751 撤销汇总添加退回审核状态 4 years ago
zhengyongxing 56593d5ee8 汇总bug修正 4 years ago
zhengyongxing dc5a65903b 汇总bug修正 4 years ago
zhengyongxing 4210bb7bf0 汇总bug修正 4 years ago
zhengyongxing b4bdcd24fc 汇总bug流程修正 4 years ago
zhengyongxing 1e67b1d1a1 汇总bug修正 4 years ago
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
4 years ago
zhengyongxing d937dbad55 聚合公司绑定功能修改 4 years ago
zhengyongxing 895b32cee8 汇总bug修改 4 years ago
zhengyongxing 518c902b2a 发起汇总修正 4 years ago
zhengyongxing 400a9b3ded 上游导出修正 4 years ago
zhengyongxing 3c698adba9 上游导出修正 4 years ago
郑永星 98563b686d Merge branch 'hotfix/payStatistic' of wmtx/platform into release
补点功能修正
4 years ago
zhengyongxing c0406a6f52 上游导出修正 4 years ago
zhengyongxing b39629fe08 补点功能修正 4 years ago
zhengyongxing b5e49e850d 上下游聚合打款信息修改 4 years ago
chenzhi 884f919387 优化聚合渠道统计 4 years ago
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
4 years ago
zhengyongxing 1fff2e6c09 财务代码搬到新的分支上 4 years ago
zhengyongxing cb0ceda1cb 聚合财务导出模板修正 5 years ago
zhengyongxing 729136a95c 聚合订单代码导出,及重算功能修改 5 years ago
chenzhi e1e431804c 优化审批 5 years ago
chenzhi 6557938e53 优化聚合渠道财务结算单 5 years ago
chenzhi 861fd07965 优化检索 5 years ago
chenzhi 834dbe0867 优化导出支付信息不记录 5 years ago
chenzhi 2ad89c2fb6 优化导出时间 5 years ago
chenzhi 21a985ae82 聚合财务结算单ok 5 years ago
chenzhi 8137778ec1 新增聚合操作日志 5 years ago
chenzhi 63f5354dc3 优化重算 5 years ago
chenzhi 2a28cf9008 聚合财务优化权限 5 years ago