Commit Graph

273 Commits (e8ea849bdc473099903fbe90d426fb285de84791)

Author SHA1 Message Date
ELF 2ae89b9edb 解决冲突
ELF 9b11202deb 修改
elf@home c4eb04428e 修改
ELF afad195062 修改
ELF ca99068a0e 修改
ELF 19c782b053 解决冲突
ELF 268ea4e34d 修改
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
ELF 6fcaa1362c 重置权限缓存
ELF 6da122550c 优化
zhengyongxing f95b593455 Merge remote-tracking branch 'origin/feature/company_export_change' into feature/company_export_change
# Conflicts:
#	Application/Base/Tool/AggregateClient.class.php
#	Data/update.sql
zhengyongxing 3c698adba9 上游导出修正
ELF 16122d5d9f 修改
chenzhi f169d65c1c 优化推广公司添加排序
ELF 050eb98843 xiugai
ELF 2c9092273f 修改
elf@home 1dd594f46f 修改bug
廖金灵 6a78824b10 Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
ELF 268e084241 修改
廖金灵 931c837d7e Merge branch 'feature/promote_company_merge' of wmtx/platform into release
优化
ELF 9d67a4c842 优化
廖金灵 c9b1326c42 Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
ELF 6596e01a29 修改
zhengyongxing 65532fc0ab Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/company_export_change_other
 Conflicts:
	Application/Admin/Controller/PromoteCompanyController.class.php
	Application/Base/Tool/AggregateClient.class.php
ELF 6e2fda1e26 解决冲突
ELF 32bc839dcd 合并
ELF e0bbec0978 修改
ELF 7614d5feca 修改
ELF e441f030c0 优化
ELF e9038d7471 ss
ELF 296e378501 修改
ELF e4854aca3a 修改
ELF 1a14ed8dc7 修改
ELF 7adabb54f9 修改
elf@home 50755b89c5 修改
ELF cc6c5d4e74 修改
ELF 2867a05bb3 修改
ELF c7390f4c2e bug修复
ELF e249596014 修改
ELF 550da5cb37 测试
ELF 06c4d5f1f1 优化测试资源
zhengyongxing b5e49e850d 上下游聚合打款信息修改
ELF fa90dc0bc8 修改
ELF c9cd377d4f 修改
ELF 367345ea8d 修改
ELF ecf460e7c9 修改
ELF 9c59ba06e2 修改
zhengyongxing 62f4ce3362 上下游聚合打款信息修改
ELF 3383b3d2d9 修改
ELF 49751b8760 测试资源修改