39 Commits (1cb13ebb4c00004c8194243452061aff377b16cd)

Author SHA1 Message Date
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 聚合财务导出模板修正 4 years ago
zhengyongxing 729136a95c 聚合订单代码导出,及重算功能修改 4 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
chenzhi fe662ce160 审核子操作ok 5 years ago
chenzhi 16d9813e18 聚合财务重算 5 years ago
chenzhi 253b47b2a9 聚合财务子操作 5 years ago
chenzhi 990c62b06a 批注增删改查 5 years ago
chenzhi 6b5f60f8e6 新增凭证增删改查 5 years ago
chenzhi afd362d847 聚合结算单导出优化3 5 years ago
chenzhi 2fc38b25b6 聚合结算单导出优化2 5 years ago
chenzhi ce4c938080 优化聚合结算导出 5 years ago
chenzhi cf9480eb89 聚合财务导出 5 years ago
chenzhi 422728ed11 聚合财务编辑 5 years ago
chenzhi bf7c7ed14f 审核 5 years ago
chenzhi 114cf4a503 聚合对账新增对账金额统计 5 years ago
chenzhi 51322e3317 聚合财务2 5 years ago
chenzhi 6d0e7c3a00 聚合对账1 5 years ago